[FFmpeg-cvslog] Revert "rmdec: Avoid allocating huge packets"

Michael Niedermayer git at videolan.org
Thu Jan 5 01:13:04 CET 2012


ffmpeg | branch: release/0.9 | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  5 00:51:12 2012 +0100| [68f121269694d61c137f046ea8f51ce717e57d7c] | committer: Michael Niedermayer

Revert "rmdec: Avoid allocating huge packets"

This reverts commit 66f71f3b5e2e7b6e5049bd9831c371e16aff8a53.

This causes regressions with RDT.
(cherry picked from commit c4eec85a1fa768025f88261995af08f1dba9685d)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68f121269694d61c137f046ea8f51ce717e57d7c
---

 libavformat/rmdec.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 7524023..5b9bfb8 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -24,7 +24,6 @@
 #include "libavutil/dict.h"
 #include "avformat.h"
 #include "internal.h"
-#include "avio_internal.h"
 #include "riff.h"
 #include "rm.h"
 
@@ -613,7 +612,6 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
     }
     if(type != 1){  // not whole frame
         len2 = get_num(pb, &len);
-        len2 = ffio_limit(pb, len2);
         pos  = get_num(pb, &len);
         pic_num = avio_r8(pb); len--;
     }



More information about the ffmpeg-cvslog mailing list