diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:18:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:18:16 +0200 |
| commit | fe30351d528f2f7fb9d712db76856f24cfef3399 (patch) | |
| tree | eb97c1f8dbcf7fca3b2b171398c9ddf119cc121f /libavformat/vqf.c | |
| parent | 7c520e5cd61a59ef2e243630ae407e274b8d84b9 (diff) | |
| parent | 330c18032464a4e1f3da907e54db2e69a6fbfcda (diff) | |
| download | ffmpeg-fe30351d528f2f7fb9d712db76856f24cfef3399.tar.gz | |
Merge commit '330c18032464a4e1f3da907e54db2e69a6fbfcda' into release/0.10
* commit '330c18032464a4e1f3da907e54db2e69a6fbfcda':
matroskaenc: allow override of "writing application" tag
avfilter: Add missing emms_c when needed
mpeg12: check scantable indices in all decode_block functions
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/vqf.c')
0 files changed, 0 insertions, 0 deletions