diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 15:59:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:03:30 +0200 |
| commit | 97edb195f45c266c5a1bcdd3674825d926fd18cf (patch) | |
| tree | 1e4bed465e6d78ebcd34a222497eb642ec4ebcef /libavformat/noproxy-test.c | |
| parent | 82e4f39883932c1b1e5c7792a1be12dec6ab603d (diff) | |
| parent | 141fdc763c2841b572d29a2ad78513e8d5325870 (diff) | |
| download | ffmpeg-97edb195f45c266c5a1bcdd3674825d926fd18cf.tar.gz | |
Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'
* commit '141fdc763c2841b572d29a2ad78513e8d5325870':
matroska: add the Opus mapping
Conflicts:
libavformat/matroska.c
See: 30549294ef0f796d48b1ffa482bd9315d4dbb83c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/noproxy-test.c')
0 files changed, 0 insertions, 0 deletions