diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 10:59:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 10:59:43 +0100 |
| commit | f58f75dd92a5d8b48e23865f6d4a69ce70d0bd1c (patch) | |
| tree | 1345408bddb30de183f5945cb3673262554f16bb /libavcodec/rv34.c | |
| parent | b222c28ee885187c5fcded69d8fa98fe60c70a7e (diff) | |
| parent | cb7190cd2c691fd93e4d3664f3fce6c19ee001dd (diff) | |
| download | ffmpeg-f58f75dd92a5d8b48e23865f6d4a69ce70d0bd1c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: error out on size changes with frame threading
aacsbr: Add a debug check to sbr_mapping.
aac: Reset some state variables when turning SBR off
aac: Reset PS parameters on header decode failure.
fate: add wmalossless test.
aacsbr: handle m_max values smaller than 4.
Conflicts:
libavcodec/aacsbr.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index e59aea4594..1944de094f 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1666,6 +1666,13 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, if (s->width != si.width || s->height != si.height) { int err; + if (HAVE_THREADS && + (s->avctx->active_thread_type & FF_THREAD_FRAME)) { + av_log_missing_feature(s->avctx, "Width/height changing with " + "frame threading is", 0); + return AVERROR_PATCHWELCOME; + } + av_log(s->avctx, AV_LOG_WARNING, "Changing dimensions to %dx%d\n", si.width, si.height); ff_MPV_common_end(s); |