summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-05 00:51:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-05 00:51:12 +0100
commitc4eec85a1fa768025f88261995af08f1dba9685d (patch)
treeddfc4a4ccae68cefc11efecf3bf6610ede6321c2
parentad8e3304f701820f927527d8f0d11679738636df (diff)
downloadffmpeg-streaming-c4eec85a1fa768025f88261995af08f1dba9685d.zip
ffmpeg-streaming-c4eec85a1fa768025f88261995af08f1dba9685d.tar.gz
Revert "rmdec: Avoid allocating huge packets"
This reverts commit 66f71f3b5e2e7b6e5049bd9831c371e16aff8a53. This causes regressions with RDT.
-rw-r--r--libavformat/rmdec.c2
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--;
}
OpenPOWER on IntegriCloud