[FFmpeg-cvslog] Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'

Michael Niedermayer git at videolan.org
Wed Oct 16 13:00:12 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 16 12:51:26 2013 +0200| [f7f74a37b82d7905e49aeb8beed02a9966f15ef6] | committer: Michael Niedermayer

Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'

* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
  h264_parser: Fix POC parsing for the case where MMCO_RESET is present.

Conflicts:
	libavcodec/h264.c

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

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





More information about the ffmpeg-cvslog mailing list