diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 20:46:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 21:23:52 +0200 |
| commit | 2a976debc1de10c22c258583b543ab5b4bbe5974 (patch) | |
| tree | a2b0a12017a42e8a37365ca84a6bf2a0179311e8 /libavcodec/dv.c | |
| parent | 2ff935f4bb6173daf3361b2ac7b58c6e33994878 (diff) | |
| parent | 2b98377935384ecd22c2cd26106b9e03a6c9f598 (diff) | |
| download | ffmpeg-2a976debc1de10c22c258583b543ab5b4bbe5974.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dv: Initialize encoder tables during encoder init.
dv: Replace some magic numbers by the appropriate #define.
FATE: pass the decoded output format and audio source file to enc_dec_pcm
FATE: specify the input format when decoding in enc_dec_pcm()
x86inc: support AVX abstraction for 2-operand instructions
configure: detect PGI compiler and set suitable flags
avconv: check for an incompatible changing channel layout
avio: make AVIOContext.av_class pointer to const
nutdec: add malloc check and fix const to non-const conversion warnings
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv.c')
| -rw-r--r-- | libavcodec/dv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 8b0818fb41..5bb84793b5 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -294,8 +294,6 @@ av_cold int ff_dvvideo_init(AVCodecContext *avctx) ff_dv_rl_vlc[i].run = run; } ff_free_vlc(&dv_vlc); - - dv_vlc_map_tableinit(); } /* Generic DSP setup */ @@ -338,6 +336,8 @@ static av_cold int dvvideo_init_encoder(AVCodecContext *avctx) return AVERROR(EINVAL); } + dv_vlc_map_tableinit(); + return ff_dvvideo_init(avctx); } |