[FFmpeg-cvslog] Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'

Michael Niedermayer git at videolan.org
Mon Mar 17 06:11:00 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 05:59:01 2014 +0100| [a81a2b514eec4614fca277c0cbd8f5a1dbe2946e] | committer: Michael Niedermayer

Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'

* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

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

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





More information about the ffmpeg-cvslog mailing list