---
avconv.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/avconv.c b/avconv.c
index d37cc80..b441abb 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1844,14 +1844,12 @@ static int output_packet(InputStream *ist, int
ist_index,
OutputStream *ost_table, int nb_ostreams,
const AVPacket *pkt)
{
- int i;
- int got_output = 1;
+ int got_output = 1, i;
int64_t pkt_pts = AV_NOPTS_VALUE;
-
AVPacket avpkt;
- if(ist->next_pts == AV_NOPTS_VALUE)
- ist->next_pts= ist->pts;
+ if (ist->next_pts == AV_NOPTS_VALUE)
+ ist->next_pts = ist->pts;
if (pkt == NULL) {
/* EOF handling */
@@ -1869,12 +1867,14 @@ static int output_packet(InputStream *ist, int
ist_index,
//while we have more to decode or while the decoder did output something
on EOF
while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) {
int ret = 0;
- ist->pts= ist->next_pts;
- if(avpkt.size && avpkt.size != pkt->size)
+ ist->pts = ist->next_pts;
+
+ if (avpkt.size && avpkt.size != pkt->size) {
av_log(NULL, ist->showed_multi_packet_warning ? AV_LOG_VERBOSE :
AV_LOG_WARNING,
"Multiple frames in a packet from stream %d\n",
pkt->stream_index);
- ist->showed_multi_packet_warning=1;
+ ist->showed_multi_packet_warning = 1;
+ }
switch(ist->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
--
1.7.7
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
