* 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
This commit is contained in:
Zdenek Kabelac 2002-11-14 18:43:49 +00:00
parent d6483a8e5c
commit adb4328917
1 changed files with 3 additions and 2 deletions

View File

@ -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;
}