Michael Niedermayer 27ccc82e1b Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavu,lavd: do not use av_pix_fmt_descriptors directly.

Conflicts:
	libavutil/imgutils.c

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

2012-10-12 17:21:01 +02:00

9.1 KiB

Raw Blame History

View Raw