[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Fri Feb 14 04:57:22 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 04:06:57 2014 +0100| [abe3f79d62f4f6d0175310a01fa18935f8fae3ef] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg12dec: do not add stereo3D side data to a non-existing frame

Conflicts:
	libavcodec/mpeg12dec.c

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

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





More information about the ffmpeg-cvslog mailing list