configure: Add misssing qpeldsp dependency to mss2 decoder

[ffmpeg] / avconv.c

diff --git a/avconv.c b/avconv.c
index 769b9e095bb94332a7b0e48ea1a417d4dc6cd3c7..5c31332812b743b7f3907808c4b0ab06348d98d2 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -206,7 +206,6 @@ static void avconv_cleanup(int ret)
         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);
             }
@@ -1351,7 +1350,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output,
     /* if the decoder provides a pts, use it instead of the last packet pts.
        the decoder could be delaying output by a packet or more. */
     if (decoded_frame->pts != AV_NOPTS_VALUE)
-        ist->next_dts = decoded_frame->pts;
+        ist->next_dts = av_rescale_q(decoded_frame->pts, ist->st->time_base, AV_TIME_BASE_Q);
     else if (pkt && pkt->pts != AV_NOPTS_VALUE) {
         decoded_frame->pts = pkt->pts;
     }