diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-11-14 18:43:49 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2002-11-14 18:43:49 +0000 |
| commit | adb4328917f8b4e0ea9462615ca9e9b5baa7334d (patch) | |
| tree | d1e2f1b1a2589092f335aba6f942c85ce9c92aa5 /libavcodec/dv.c | |
| parent | d6483a8e5cfc4e253e2d5f9f185a90ee4827b4a0 (diff) | |
| download | ffmpeg-adb4328917f8b4e0ea9462615ca9e9b5baa7334d.tar.gz | |
* not checking for get_buffer_callback - it would be user's error
* if DR1 is disabled in get_buffer_callback silently fallback to
non-dr rendering
Originally committed as revision 1208 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dv.c')
| -rw-r--r-- | libavcodec/dv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index d7062c5699..1492d6854b 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -561,11 +561,12 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, avctx->width = width; avctx->height = height; - if (avctx->flags & CODEC_FLAG_DR1 && avctx->get_buffer_callback) + if (avctx->flags & CODEC_FLAG_DR1) { s->width = -1; avctx->dr_buffer[0] = avctx->dr_buffer[1] = avctx->dr_buffer[2] = 0; - if(avctx->get_buffer_callback(avctx, width, height, I_TYPE) < 0){ + if(avctx->get_buffer_callback(avctx, width, height, I_TYPE) < 0 + && avctx->flags & CODEC_FLAG_DR1) { fprintf(stderr, "get_buffer() failed\n"); return -1; } |