apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-30 20:16:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-08-15 02:08:59 +02:00
parent 8b6cbc3c33 998c9f15d1
commit 2fd87a3d78
10 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/rv10.c
View File

@@ -517,6 +517,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
ff_mpv_idct_init(s);
if ((ret = ff_MPV_common_init(s)) < 0)
return ret;