[FFmpeg-cvslog] Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
Michael Niedermayer
git at videolan.org
Tue Jan 27 16:14:28 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 16:03:23 2015 +0100| [392080cbe52868c00f8dfd4e60639c37a13165f4] | committer: Michael Niedermayer
Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6':
h264: drop any pretense of support for data partitioning
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=392080cbe52868c00f8dfd4e60639c37a13165f4
---
More information about the ffmpeg-cvslog
mailing list