[SCM] libav/experimental: Move the definitions of data_buf and data_size closer to where they are used.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:56:48 UTC 2013
The following commit has been merged in the experimental branch:
commit 8157483d6436194e901717cb1aa3bd1aaf6d3dd7
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Jan 7 00:47:23 2010 +0000
Move the definitions of data_buf and data_size closer to where they are used.
Originally committed as revision 21040 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffmpeg.c b/ffmpeg.c
index 11350ae..4e51c4d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1272,8 +1272,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
AVFormatContext *os;
AVOutputStream *ost;
int ret, i;
- uint8_t *data_buf;
- int data_size, got_picture;
+ int got_picture;
AVFrame picture;
void *buffer_to_free;
static unsigned int samples_size= 0;
@@ -1300,6 +1299,8 @@ static int output_packet(AVInputStream *ist, int ist_index,
//while we have more to decode or while the decoder did output something on EOF
while (avpkt.size > 0 || (!pkt && ist->next_pts != ist->pts)) {
+ uint8_t *data_buf;
+ int data_size;
handle_eof:
ist->pts= ist->next_pts;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list