[FFmpeg-cvslog] Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 15 02:08:59 2014 +0200| [2fd87a3d7895ce36e558a306d03e33697d456086] | committer: Michael Niedermayer

Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'

* commit '998c9f15d1ca8c7489775ebcca51623b915988f1':
  idct: remove call to ff_idctdsp_init from ff_MPV_common_init

Conflicts:
	libavcodec/dnxhdenc.c
	libavcodec/h263dec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h

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

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