Merge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 02:03:02 +0000 (03:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 02:03:02 +0000 (03:03 +0100)
commit9b9f64fe315ca7a7a8b9517ab5c082ecb8b698be
tree8762a81c9a64e8732d46161986ea28e174010208
parentfb17f03dadc3e344e3d996d7ea0f09e340fdd05b
parenta4d0c6e0503562d4cc8f9f6d02d84d7b32583b15
Merge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'

* commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15':
  mpegvideo: move dct_unquantize functions up to avoid forward declarations

Conflicts:
libavcodec/mpegvideo.c

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