[FFmpeg-cvslog] Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'
Michael Niedermayer
git at videolan.org
Sun Jun 16 22:59:51 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 16 22:51:56 2013 +0200| [0a5d22a195b26d83dc823b041054b2a516a6c558] | committer: Michael Niedermayer
Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'
* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
h264_mp4toannexb_bsf: factor out extradata parsing
Conflicts:
libavcodec/h264_mp4toannexb_bsf.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a5d22a195b26d83dc823b041054b2a516a6c558
---
More information about the ffmpeg-cvslog
mailing list