opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-19 13:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: cosmetics: combine two variable declarations

Browse Source 
Originally committed as revision 23677 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alexander Strange
2010-06-21 04:15:18 +00:00
parent 19ed4b8647
commit 28db32159e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@ -1514,7 +1514,6 @@ static int output_packet(AVInputStream *ist, int ist_index,
void *buffer_to_free; void *buffer_to_free;
static unsigned int samples_size= 0; static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free; AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
int frame_available; int frame_available;
#endif #endif
@ -1609,10 +1608,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
break; break;
case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_SUBTITLE:
ret = avcodec_decode_subtitle2(ist->st->codec, ret = avcodec_decode_subtitle2(ist->st->codec,
&subtitle, &got_subtitle, &avpkt); &subtitle, &got_picture, &avpkt);
if (ret < 0) if (ret < 0)
goto fail_decode; goto fail_decode;
if (!got_subtitle) { if (!got_picture) {
goto discard_packet; goto discard_packet;
} }
subtitle_to_free = &subtitle; subtitle_to_free = &subtitle;