Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 00:08:59 +0000 (02:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Aug 2014 00:25:14 +0000 (02:25 +0200)
commit2fd87a3d7895ce36e558a306d03e33697d456086
tree99a9b5ef8a07475a55d89050993a0071e9ea4008
parent8b6cbc3c3319f7942d679d6f6319971c102cfbd3
parent998c9f15d1ca8c7489775ebcca51623b915988f1
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@gmx.at>
libavcodec/dnxhdenc.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/rv34.c