[FFmpeg-cvslog] rv34: error out on size changes with frame threading

Janne Grunau git at videolan.org
Sat Mar 24 11:31:29 CET 2012


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Fri Mar 23 22:30:38 2012 +0100| [cb7190cd2c691fd93e4d3664f3fce6c19ee001dd] | committer: Janne Grunau

rv34: error out on size changes with frame threading

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb7190cd2c691fd93e4d3664f3fce6c19ee001dd
---

 libavcodec/rv34.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index f9ea40d..da5d437 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1662,6 +1662,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);



More information about the ffmpeg-cvslog mailing list