diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:47:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:47:41 +0200 |
| commit | 9ae26ef9c3442b9c2cfa2c0f1bc346febd9a9499 (patch) | |
| tree | 32277f5f9b1d144aaf542b6d571f01a4ce2d500b /ffmpeg_filter.c | |
| parent | b9be91c03d274be5fa3fcd860ba37bb2fbeca429 (diff) | |
| parent | eb89e1b98d3676aac1287d97c633b527c1ff4ea4 (diff) | |
| download | ffmpeg-9ae26ef9c3442b9c2cfa2c0f1bc346febd9a9499.tar.gz | |
Merge commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4' into release/1.1
* commit 'eb89e1b98d3676aac1287d97c633b527c1ff4ea4':
oggdec: add support for Opus in Ogg demuxing
Conflicts:
libavformat/oggparseopus.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions