From 28db32159eba8c74a1c873f1efdd2f747a00ed12 Mon Sep 17 00:00:00 2001
From: Alexander Strange <astrange@ithinksw.com>
Date: Mon, 21 Jun 2010 04:15:18 +0000
Subject: [PATCH] ffmpeg: cosmetics: combine two variable declarations
Originally committed as revision 23677 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffmpeg.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index b8dbe367e19..85983d5c704 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1514,7 +1514,6 @@ static int output_packet(AVInputStream *ist, int ist_index,
void *buffer_to_free;
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
- int got_subtitle;
#if CONFIG_AVFILTER
int frame_available;
#endif
@@ -1609,10 +1608,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
break;
case AVMEDIA_TYPE_SUBTITLE:
ret = avcodec_decode_subtitle2(ist->st->codec,
- &subtitle, &got_subtitle, &avpkt);
+ &subtitle, &got_picture, &avpkt);
if (ret < 0)
goto fail_decode;
- if (!got_subtitle) {
+ if (!got_picture) {
goto discard_packet;
}
subtitle_to_free = &subtitle;
--
GitLab