diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-05 00:51:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-05 01:06:13 +0100 |
| commit | 68f121269694d61c137f046ea8f51ce717e57d7c (patch) | |
| tree | 6580ef3c1d1034f64427813a2c8aaffa66e04fe8 /libavformat | |
| parent | 0a5bca957d0d6ee9e77150dc5a20038c178d5282 (diff) | |
| download | ffmpeg-68f121269694d61c137f046ea8f51ce717e57d7c.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rmdec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 75240236e8..5b9bfb869a 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--; } |