[FFmpeg-cvslog] Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'
Michael Niedermayer
git at videolan.org
Fri Jun 20 23:33:35 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 23:18:45 2014 +0200| [4667116c394b29a96a1017e1bf130561676cb498] | committer: Michael Niedermayer
Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'
* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
h264: fix build when error resilience is disabled
Conflicts:
libavcodec/h264_picture.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4667116c394b29a96a1017e1bf130561676cb498
---
More information about the ffmpeg-cvslog
mailing list