diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-22 06:53:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-22 06:53:19 +0400 |
commit | bf8bb94322d92134206392c3f238a58c424b1c9e (patch) | |
tree | 5522036771e42e1e7b539fb190302b530bcb49d0 /libavcodec/svq3.c | |
parent | 33adcdb53118df8f281742b75adf861cda64801a (diff) | |
parent | 71cc331cab8d61130048f3003f2ca77cfb94e3f3 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffmpeg: get rid of the -vglobal option.
dct32: Add AVX implementation of 32-point DCT
dct32: Change pass 6 permutation to allow for AVX implementation
dct32: port SSE 32-point DCT to YASM
multiple inclusion guard cleanup
avio: document buffer must created with av_malloc() and friends
avio: check AVIOContext malloc failure
swscale: point out an alternative to sws_getContext
svq3: Do initialization after parsing the extradata
add changelog entries for 0.7_beta2
mp3lame: add #include required for AV_RB32 macro.
Conflicts:
Changelog
libavcodec/svq3.c
libavcodec/x86/dct32_sse.c
libavfilter/vsrc_buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a7e806540a..95c85fa0bb 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -819,21 +819,12 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) avctx->pix_fmt = avctx->codec->pix_fmts[0]; if (!s->context_initialized) { - s->width = avctx->width; - s->height = avctx->height; h->chroma_qp[0] = h->chroma_qp[1] = 4; svq3->halfpel_flag = 1; svq3->thirdpel_flag = 1; svq3->unknown_flag = 0; - if (MPV_common_init(s) < 0) - return -1; - - h->b_stride = 4*s->mb_width; - - ff_h264_alloc_tables(h); - /* prowl for the "SEQH" marker in the extradata */ extradata = (unsigned char *)avctx->extradata; for (m = 0; m < avctx->extradata_size; m++) { @@ -920,6 +911,16 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) #endif } } + + s->width = avctx->width; + s->height = avctx->height; + + if (MPV_common_init(s) < 0) + return -1; + + h->b_stride = 4*s->mb_width; + + ff_h264_alloc_tables(h); } return 0; |