diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-27 22:18:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-27 22:18:03 +0100 |
| commit | f769671f86ed84a886a4360998ddd7f1fb0bc55d (patch) | |
| tree | 2e2fa57038ed478722e3c56daa5535d8ce996274 /ffmpeg.c | |
| parent | a38a1d516fe68542523c772af27e41f28ae9852c (diff) | |
| parent | 090c67d586e3916f9acc49e010b6389d07f97153 (diff) | |
| download | ffmpeg-f769671f86ed84a886a4360998ddd7f1fb0bc55d.tar.gz | |
Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'
* commit '090c67d586e3916f9acc49e010b6389d07f97153':
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 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions