[FFmpeg-cvslog] Merge commit 'b7040e67ec18259ca634a0e29d98469b3484a87c'

Michael Niedermayer git at videolan.org
Tue Jul 28 00:40:00 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 28 00:27:37 2015 +0200| [ea7e4f8e6aa2500716b55a1d9ad247bca1cd1174] | committer: Michael Niedermayer

Merge commit 'b7040e67ec18259ca634a0e29d98469b3484a87c'

* commit 'b7040e67ec18259ca634a0e29d98469b3484a87c':
  h264: fix AVDISCARD_NONKEY for some interlaced content

Conflicts:
	libavcodec/h264.c

Not merged, the used field is not initialized where it is used

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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





More information about the ffmpeg-cvslog mailing list