mirror of https://git.ffmpeg.org/ffmpeg.git
ffmpeg: cosmetics: combine two variable declarations
Originally committed as revision 23677 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
19ed4b8647
commit
28db32159e
5
ffmpeg.c
5
ffmpeg.c
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue