aacdec: Lower the number of frames required to detect ADTS

[ffmpeg] / libavformat / rawdec.c

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 1c9aabd6fdc0b54341925efb81bdda85deaeb822..41e1700b8b464bf6be7bf928348a17f8f071656f 100644 (file)
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -45,6 +45,10 @@ int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
     if (ret < 0) {
         av_free_packet(pkt);
         return ret;
+    } else if (ret < size) {
+        /* initialize end of packet for partial reads to avoid reading
+         * uninitialized data on allowed overreads */
+        memset(pkt->data + ret, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     }
     pkt->size = ret;
     return ret;
@@ -88,9 +92,6 @@ int ff_raw_video_read_header(AVFormatContext *s)
         goto fail;
     }
 
-#if FF_API_R_FRAME_RATE
-    st->r_frame_rate =
-#endif
     st->avg_frame_rate = framerate;
     avpriv_set_pts_info(st, 64, framerate.den, framerate.num);