diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-08 17:25:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-08 17:42:56 +0100 |
| commit | a30f7918b52d076c55a42bef3a731165b354bf08 (patch) | |
| tree | f659d43c5ff88425e8d2c740dfe191da87e5988c /libavcodec/h263dec.c | |
| parent | f8a9cf77040e1b2ed83206269ead11aa30afb98d (diff) | |
| parent | 0338c396987c82b41d322630ea9712fe5f9561d6 (diff) | |
| download | ffmpeg-a30f7918b52d076c55a42bef3a731165b354bf08.tar.gz | |
Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'
* 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>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e7030d1cbb..15a9a42552 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -124,6 +124,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) if ((ret = ff_MPV_common_init(s)) < 0) return ret; + ff_h263dsp_init(&s->h263dsp); ff_h263_decode_init_vlc(); return 0; |