[FFmpeg-cvslog] Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'

Michael Niedermayer git at videolan.org
Sat Mar 21 17:30:50 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 17:23:10 2015 +0100| [a0b39747b7213b5b76c0ce5984c1dac63933737f] | committer: Michael Niedermayer

Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'

* commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719':
  h264_mb: constify all uses of H264Context

Conflicts:
	libavcodec/h264.h
	libavcodec/h264_mb.c

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

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





More information about the ffmpeg-cvslog mailing list