diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-11-22 07:16:23 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-23 22:02:59 +0100 |
| commit | 8b0268a85388d26c8e2e70e6d714c8ff54e50eae (patch) | |
| tree | 99556240da74e682241dfee4adf21d85ba9d3c81 /avconv.c | |
| parent | ffa0674e5a3bc839c28794eedaa0b3151e7fe5f2 (diff) | |
| download | ffmpeg-8b0268a85388d26c8e2e70e6d714c8ff54e50eae.tar.gz | |
avconv: formatting fixes in output_packet()
Diffstat (limited to 'avconv.c')
| -rw-r--r-- | avconv.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1843,11 +1843,10 @@ static int output_packet(InputStream *ist, int ist_index, int i; int got_output; 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 */ @@ -1868,12 +1867,14 @@ static int output_packet(InputStream *ist, int ist_index, while (ist->decoding_needed && (avpkt.size > 0 || (!pkt && got_output))) { int ret = 0; handle_eof: - 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: |