[FFmpeg-cvslog] Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'
Michael Niedermayer
git at videolan.org
Thu Mar 5 21:04:20 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 5 20:55:56 2015 +0100| [22ad0546c8ab1728c69281145c92f3538d2408c1] | committer: Michael Niedermayer
Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'
* commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049':
h264: remove a now redundant error check
Conflicts:
libavcodec/h264_slice.c
See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22ad0546c8ab1728c69281145c92f3538d2408c1
---
More information about the ffmpeg-cvslog
mailing list