Commit adb43289 authored by Zdenek Kabelac's avatar Zdenek Kabelac
Browse files

* 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
parent d6483a8e
...@@ -561,11 +561,12 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, ...@@ -561,11 +561,12 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
avctx->width = width; avctx->width = width;
avctx->height = height; avctx->height = height;
if (avctx->flags & CODEC_FLAG_DR1 && avctx->get_buffer_callback) if (avctx->flags & CODEC_FLAG_DR1)
{ {
s->width = -1; s->width = -1;
avctx->dr_buffer[0] = avctx->dr_buffer[1] = avctx->dr_buffer[2] = 0; 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"); fprintf(stderr, "get_buffer() failed\n");
return -1; return -1;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment