diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:39:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:46:08 +0200 |
| commit | faba79e0800ded6285e2cf75622fa42077e781f4 (patch) | |
| tree | cc57a187242b52fcde696caf65571b411ab5d392 /libavformat | |
| parent | d9c23a0d5a56488b146eef17a19a9b47643be333 (diff) | |
| parent | 1f6f58d5855288492fc2640a9f1035c01c75d356 (diff) | |
| download | ffmpeg-faba79e0800ded6285e2cf75622fa42077e781f4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
H.264: tweak some other x86 asm for Atom
probe: Fix insane flow control.
mpegts: remove invalid error check
s302m: use nondeprecated audio sample format API
lavc: use designated initialisers for all codecs.
x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegts.c | 4 | ||||
| -rw-r--r-- | libavformat/mxfdec.c | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a404031d00..630a42ab00 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1491,10 +1491,6 @@ static int mpegts_read_header(AVFormatContext *s, if (ap) { if (ap->mpeg2ts_compute_pcr) ts->mpeg2ts_compute_pcr = ap->mpeg2ts_compute_pcr; - if(ap->mpeg2ts_raw){ - av_log(s, AV_LOG_ERROR, "use mpegtsraw_demuxer!\n"); - return -1; - } } #endif diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 4fa908bba7..c27fbfcd62 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -600,7 +600,7 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int default: /* Private uid used by SONY C0023S01.mxf */ if (IS_KLV_KEY(uid, mxf_sony_mpeg4_extradata)) { - descriptor->extradata = av_malloc(size); + descriptor->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); if (!descriptor->extradata) return -1; descriptor->extradata_size = size; diff --git a/libavformat/utils.c b/libavformat/utils.c index 74891049ae..81577c9158 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -522,9 +522,9 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, return AVERROR(EINVAL); } - for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt && ret >= 0; + for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt; probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) { - int ret, score = probe_size < max_probe_size ? AVPROBE_SCORE_MAX/4 : 0; + int score = probe_size < max_probe_size ? AVPROBE_SCORE_MAX/4 : 0; int buf_offset = (probe_size == PROBE_BUF_MIN) ? 0 : probe_size>>1; if (probe_size < offset) { |