Michael Niedermayer 6ee2911996 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavc: drop ff_pixfmt_list_420

Conflicts:
	libavcodec/flvdec.c
	libavcodec/msmpeg4dec.c
	libavcodec/rv10.c

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

2014-03-23 03:56:43 +01:00

23 KiB

Raw Blame History

View Raw