[FFmpeg-cvslog] Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'
Michael Niedermayer
git at videolan.org
Fri Feb 14 14:07:21 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 13:58:02 2014 +0100| [99b12357f47efd7da070e29d888e9e7646824667] | committer: Michael Niedermayer
Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc'
* commit '3a0576702825423abecb32627c530dbc4c0f73bc':
h264: store current_sps_id inside the current sps
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
The current_sps_id is not removed as it used in security related code.
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99b12357f47efd7da070e29d888e9e7646824667
---
More information about the ffmpeg-cvslog
mailing list