[FFmpeg-cvslog] Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'

Michael Niedermayer git at videolan.org
Tue Jan 27 15:15:46 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 15:08:17 2015 +0100| [6e57d2da9058fcb0eefedf5102321a044d51e6dc] | committer: Michael Niedermayer

Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'

* commit '9404a47a2d1df418946a338938eb6cdb3afed474':
  h264: move parser-only variables to their own context

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e57d2da9058fcb0eefedf5102321a044d51e6dc
---





More information about the ffmpeg-cvslog mailing list