eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-05 13:45:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'

Browse Source 
* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
	configure
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-08 17:25:13 +01:00
parent f8a9cf7704 0338c39698
commit a30f7918b5
15 changed files with 210 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/rv10.c
View File

@@ -500,6 +500,7 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
if ((ret = ff_MPV_common_init(s)) < 0)
return ret;
ff_h263dsp_init(&s->h263dsp);
ff_h263_decode_init_vlc();
/* init rv vlc */