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)
* qatar/master:
  mpegvideo: initialize videodsp with correct pixel depth

Conflicts:
libavcodec/mpegvideo.c

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

Simple merge