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 /libavcodec/synth_filter.c | |
| parent | b4d4e51027e0c55e35c081cb180396ab04099b2f (diff) | |
| parent | 6e5cdf26281945ddea3aaf5eca4d127791f23ca8 (diff) | |
| download | ffmpeg-577b39aea221ddc9606f3b5ca698516155cdfd43.tar.gz | |
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 'libavcodec/synth_filter.c')
0 files changed, 0 insertions, 0 deletions