virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'

Browse Source 
* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0':
  vc1: fix a memleak.

Conflicts:
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-22 12:28:49 +01:00
commit d7fbb63122
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vc1dec.c
View File

@ -6212,12 +6212,11 @@ image:
if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0) if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
goto err; goto err;
ff_print_debug_info(s, s->current_picture_ptr, pict); ff_print_debug_info(s, s->current_picture_ptr, pict);
*got_frame = 1;
} else if (s->last_picture_ptr != NULL) { } else if (s->last_picture_ptr != NULL) {
if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0) if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
goto err; goto err;
ff_print_debug_info(s, s->last_picture_ptr, pict); ff_print_debug_info(s, s->last_picture_ptr, pict);
}
if (s->last_picture_ptr || s->low_delay) {
*got_frame = 1; *got_frame = 1;
} }
} }