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

Michael Niedermayer git at videolan.org
Thu Nov 14 03:27:36 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 03:13:39 2013 +0100| [5231eecdafff38d0b604c028be08f8fb78d55e53] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Deprecate obsolete XvMC hardware decoding support

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo.c
	libavcodec/options_table.h
	libavutil/pixdesc.c
	libavutil/version.h

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

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





More information about the ffmpeg-cvslog mailing list