Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 15:21:01 +0000 (17:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 15:21:01 +0000 (17:21 +0200)
commit27ccc82e1bb1b97a85e5fb33b92082267078b4d1
tree6dbdea647635c92e397cf37407540070453340c5
parent13afee951a49964abb6d3e2d11644ac9d5ded2c7
parent22c8cbc0da8be2ba80190d42d381f63da389734f
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>
libavdevice/fbdev.c
libavutil/imgutils.c