[FFmpeg-cvslog] Merge commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6'
Michael Niedermayer
git at videolan.org
Wed Apr 29 13:24:35 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 13:01:15 2015 +0200| [ab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002] | committer: Michael Niedermayer
Merge commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6'
* commit 'ee62b364be0c30cba83b5ff10a3ca8c3e866ade6':
h264: eliminate ff_h264_set_parameter_from_sps()
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab7ad5e6a1b8359b169e7bcbe96ce7162d0c0002
---
More information about the ffmpeg-cvslog
mailing list