Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Dec 2012 13:35:54 +0000 (14:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Dec 2012 14:19:35 +0000 (15:19 +0100)
commit39d178806d9111e0e4a1e9400d4df0d00093ad00
tree54c65a1fac9a8b7b71340e96af4ff22e291a2ffb
parent075eaf8d6afcbce4a17380231c80a1c945e53239
parent1f4ea4e068f1131bff6c246308f52acbf1347cc2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: initialize videodsp with correct pixel depth

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c