diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-22 00:48:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-22 01:51:53 +0100 |
| commit | 52c522c72090233edeeb0486a9bd8bee925a710a (patch) | |
| tree | 23f091bb1fb649e8358d01516670360c13cb08e6 /libavformat/flacdec.c | |
| parent | a40f43db647bfacafbd1e27a4cd5f6134c6e6c53 (diff) | |
| parent | e9dc92012773aab5f51d8d37eb14564988c5f217 (diff) | |
| download | ffmpeg-52c522c72090233edeeb0486a9bd8bee925a710a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
asfdec: add side data to ASFStream packet instead of output packet.
idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.
nellymoserdec: Indicate that the decoder can handle changed parameters
libavcodec: Apply parameter change side data when decoding audio
flvdec: Add param change side data if the sample rate or channels have changed
libavformat: Add a utility function for adding parameter change side data
libavcodec: Define a side data type for parameter changes
aacdec: Handle new extradata passed as side data
flvdec: Export new AAC/H.264 extradata as side data on the next packet
libavcodec: Define a side data type for new extradata
flacdec: skip all track indices at once instead of looping.
mxf: Add PictureEssenceCoding UL for V210.
mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*
mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.
mxf: H.264/MPEG-4 AVC Intra support
configure: Show whether the safe bitstream reader is enabled
x86: Tighten register constraints for decode_significance*_x86.
Replace Subversion revisions in comments by Git hashes.
h264_cabac: synchronize decode_significance_*_x86 conditionals
w32threads: wait for the waked thread in pthread_cond_signal.
...
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavformat/flvdec.c
libavformat/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flacdec.c')
| -rw-r--r-- | libavformat/flacdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 163d2fac61..070f9af3f6 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -102,7 +102,7 @@ static int flac_read_header(AVFormatContext *s, uint8_t isrc[13]; uint64_t start; const uint8_t *offset; - int i, j, chapters, track, ti; + int i, chapters, track, ti; if (metadata_size < 431) return AVERROR_INVALIDDATA; offset = buffer + 395; @@ -119,8 +119,7 @@ static int flac_read_header(AVFormatContext *s, offset += 14; ti = bytestream_get_byte(&offset); if (ti <= 0) return AVERROR_INVALIDDATA; - for (j = 0; j < ti; j++) - offset += 12; + offset += ti * 12; avpriv_new_chapter(s, track, st->time_base, start, AV_NOPTS_VALUE, isrc); } } else { |