diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:21:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:31:04 +0100 |
| commit | 577b39aea221ddc9606f3b5ca698516155cdfd43 (patch) | |
| tree | 115c086bc6eed1f4e60468c5ace8228c31c3cbf5 /libavformat/riff.c | |
| parent | b4d4e51027e0c55e35c081cb180396ab04099b2f (diff) | |
| parent | 6e5cdf26281945ddea3aaf5eca4d127791f23ca8 (diff) | |
Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'
* commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8':
h264: check ref_count validity for num_ref_idx_active_override_flag
h264: add missing new line to log message
dcadec: skip QMF on unused channels
wavenc: write fact chunk sample count at the correct file position
riff: do not add empty metadata tags in INFO chunk
Conflicts:
libavcodec/dcadec.c
libavcodec/h264.c
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 684546670a..5ad0eb01c8 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -837,6 +837,12 @@ int ff_read_riff_info(AVFormatContext *s, int64_t size) chunk_size += (chunk_size & 1); + if (!chunk_code) { + if (chunk_size) + avio_skip(pb, chunk_size); + continue; + } + value = av_mallocz(chunk_size + 1); if (!value) { av_log(s, AV_LOG_ERROR, "out of memory, unable to read INFO tag\n"); |