[FFmpeg-cvslog] Merge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'

Michael Niedermayer git at videolan.org
Mon Dec 9 22:23:21 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 22:16:27 2013 +0100| [33dfddf65324dcb28114ea6907071605c2c3857b] | committer: Michael Niedermayer

Merge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'

* commit '3d1d175367f1f22e0c4952299a258272e2e2acf1':
  mpeg12enc: set frame packing information when relevant metadata is found

Conflicts:
	libavcodec/mpeg12enc.c

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

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





More information about the ffmpeg-cvslog mailing list