summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-08-08 12:27:50 +0200
committerAnton Khirnov <anton@khirnov.net>2012-08-08 20:16:29 +0200
commitf154ef1ae5b03f288dd8c025dab1884b4cb20c1a (patch)
tree9c0629cbfa176ca90e9c522966771e9a2e07259a /avconv.c
parentcc2133b66abb3fe3dbb4feebe7cc9ceae3f8ec64 (diff)
avconv: send EOF to lavfi even if flushing the decoder fails
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/avconv.c b/avconv.c
index b786d8d1d6..d46c8e0943 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1069,15 +1069,11 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
decoded_frame = ist->decoded_frame;
ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt);
- if (ret < 0) {
- return ret;
- }
-
- if (!*got_output) {
- /* no audio frame */
- if (!pkt->size)
+ if (!*got_output || ret < 0) {
+ if (!pkt->size) {
for (i = 0; i < ist->nb_filters; i++)
av_buffersrc_buffer(ist->filters[i]->filter, NULL);
+ }
return ret;
}
@@ -1216,17 +1212,15 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
ret = avcodec_decode_video2(ist->st->codec,
decoded_frame, got_output, pkt);
- if (ret < 0)
- return ret;
-
- quality = same_quant ? decoded_frame->quality : 0;
- if (!*got_output) {
- /* no picture yet */
- if (!pkt->size)
+ if (!*got_output || ret < 0) {
+ if (!pkt->size) {
for (i = 0; i < ist->nb_filters; i++)
av_buffersrc_buffer(ist->filters[i]->filter, NULL);
+ }
return ret;
}
+
+ quality = same_quant ? decoded_frame->quality : 0;
decoded_frame->pts = guess_correct_pts(&ist->pts_ctx, decoded_frame->pkt_pts,
decoded_frame->pkt_dts);
pkt->size = 0;