Browse Source

avconv: Check that muxing_queue exists before reading from it

This avoids a segfault on nonexisting codec names.
tags/n3.3
Diego Biurrun 9 years ago
parent
commit
e46a6fb773
1 changed files with 8 additions and 6 deletions
  1. +8
    -6
      avconv.c

+ 8
- 6
avconv.c View File

@@ -203,13 +203,15 @@ static void avconv_cleanup(int ret)

avcodec_free_context(&ost->enc_ctx);

while (av_fifo_size(ost->muxing_queue)) {
AVPacket pkt;
av_fifo_generic_read(ost->muxing_queue, &pkt, sizeof(pkt), NULL);
av_packet_unref(&pkt);
if (ost->muxing_queue) {
while (av_fifo_size(ost->muxing_queue)) {
AVPacket pkt;
av_log(NULL, AV_LOG_INFO, "after av_fifo_size()\n");
av_fifo_generic_read(ost->muxing_queue, &pkt, sizeof(pkt), NULL);
av_packet_unref(&pkt);
}
av_fifo_free(ost->muxing_queue);
}
av_fifo_free(ost->muxing_queue);

av_freep(&output_streams[i]);
}
for (i = 0; i < nb_input_files; i++) {


Loading…
Cancel
Save