diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 11:42:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 11:42:42 +0200 |
| commit | f48366c7040ab2544a1d624f0a927a0b7780dd06 (patch) | |
| tree | 615c012103362599ee8deff39d597b8e7eb962cb /libavformat/avio.c | |
| parent | a620c8321efcf51e3d35462a5b7f088815faed14 (diff) | |
| parent | e21307a2b024938c6714f57c0524bdec72d607c7 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: don't abort if both encoder and muxer aspect ratios are not set
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avio.c')
0 files changed, 0 insertions, 0 deletions