diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2003-12-08 18:26:22 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2003-12-08 18:26:22 +0000 |
| commit | f8830383a9d63289f9f9b4b7c7a4577636a1764e (patch) | |
| tree | 5502819336d73b5e3c402e9bb33d9462d089a4b0 /libavcodec/vp3.c | |
| parent | f0a93eb0b2e531c7bd759bd49cf68f907622e767 (diff) | |
FF_DEBUG_PICT_INFO and CODEC_FLAG_GRAY support
Originally committed as revision 2577 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index d69e8ab37e..636d2dfd80 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2406,7 +2406,8 @@ static void render_fragments(Vp3DecodeContext *s, } /* transform if this block was coded */ - if (s->all_fragments[i].coding_method != MODE_COPY) { + if ((s->all_fragments[i].coding_method != MODE_COPY) && + !((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) { if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || (s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) @@ -2792,8 +2793,9 @@ static int vp3_decode_frame(AVCodecContext *avctx, if (s->theora >= 0x030300) skip_bits1(&gb); - debug_vp3(" VP3 %sframe #%d: Q index = %d\n", - s->keyframe?"key":"", counter, s->quality_index); + if (s->avctx->debug & FF_DEBUG_PICT_INFO) + av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n", + s->keyframe?"key":"", counter, s->quality_index); counter++; if (s->quality_index != s->last_quality_index) |