diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 14:53:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 15:07:20 +0200 |
| commit | 564909093a318a6520a7bac7353ddea325e9f6fb (patch) | |
| tree | 025f724dfd05662fd9cade83d5bd7cbe87c3bc74 /libavformat | |
| parent | 2c0ec526e2c3cf24766910486c710bf600ef2f44 (diff) | |
| parent | adadc3f2443d25b375e21e801516ccfd78e0b080 (diff) | |
| download | ffmpeg-564909093a318a6520a7bac7353ddea325e9f6fb.tar.gz | |
Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'
* commit 'adadc3f2443d25b375e21e801516ccfd78e0b080':
qdm2: refactor joined stereo support
Conflicts:
libavcodec/qdm2.c
See: 2b12d1ffd841cf57976b124c1882e4a23a7c5f61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions