diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:33:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:33:33 +0100 |
| commit | 6f9bb83dbb93bc3bb25d23a342fb85c2eb99298e (patch) | |
| tree | 901cdac22386f7144a19b7373eba7b9761918dc7 /libavcodec/xiph.c | |
| parent | 97a55f00d35cb28497002329a17ab2f39a554cea (diff) | |
| parent | bae05e5326703dad3bfe0ed5b31ba73ee9254515 (diff) | |
| download | ffmpeg-6f9bb83dbb93bc3bb25d23a342fb85c2eb99298e.tar.gz | |
Merge commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515' into release/2.4
* commit 'bae05e5326703dad3bfe0ed5b31ba73ee9254515':
matroskaenc: write correct Display{Width, Height} in stereo encoding
Conflicts:
libavformat/matroskaenc.c
See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions