[FFmpeg-cvslog] Merge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 03:03:02 2014 +0100| [9b9f64fe315ca7a7a8b9517ab5c082ecb8b698be] | committer: Michael Niedermayer

Merge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'

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

Conflicts:
	libavcodec/mpegvideo.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b9f64fe315ca7a7a8b9517ab5c082ecb8b698be
---