mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
* 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:
parent
d6483a8e5c
commit
adb4328917
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user