diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 00:23:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 00:35:31 +0200 |
| commit | 28d3738428128d0bf16ff23995b08b3289179478 (patch) | |
| tree | a45fc603df658badc2cb3eef0da0b340d409ca4a /libavformat/iff.c | |
| parent | 6c4cc0f640874f6098ef98bad54c3fc0fa7c615f (diff) | |
| parent | dcb9f6a20dbddd1f95b6b322fc4c5fd0b5315729 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add LATM demuxer
avplay: flush audio decoder with empty packets at EOF if the decoder has CODEC_CAP_DELAY set.
8svx/iff: fix decoding of compressed stereo 8svx files.
8svx: log an error message if output buffer is too small
8svx: check packet size before reading the initial sample value.
8svx: output 8-bit samples instead of 16-bit.
8svx: split delta decoding into a separate function.
mp4: Don't read an empty Decoder Config Descriptor
fate.sh: Ignore errors from rm command during cleanup.
fate.sh: Run git-pull in quiet mode to avoid console spam.
Apple ProRes decoder
rtmp: Make the input FLV parser handle data cut at any point
rv34: Check for invalid slices offsets
eval: test isnan(sqrt(-1)) instead of just sqrt(-1)
Conflicts:
Changelog
libavcodec/8svx.c
libavcodec/proresdec.c
libavcodec/version.h
libavformat/iff.c
libavformat/version.h
tests/ref/fate/eval
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/iff.c')
| -rw-r--r-- | libavformat/iff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/iff.c b/libavformat/iff.c index 9455d96817..ebc4798feb 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -85,7 +85,6 @@ typedef struct { uint64_t body_pos; uint32_t body_size; uint32_t sent_bytes; - uint32_t audio_frame_count; svx8_compression_type svx8_compression; bitmap_compression_type bitmap_compression; ///< delta compression method used unsigned bpp; ///< bits per plane to decode (differs from bits_per_coded_sample if HAM) @@ -313,7 +312,7 @@ static int iff_read_packet(AVFormatContext *s, int ret; if(iff->sent_bytes >= iff->body_size) - return AVERROR(EIO); + return AVERROR_EOF; if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { ret = av_get_packet(pb, pkt, iff->body_size); |