diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 09:07:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 09:09:43 +0200 |
| commit | 8dbf98e68a9b7d92705661a2d6900c6d914a8068 (patch) | |
| tree | 13c9f40f1470f0cb498dc466216f6533d978ef29 /libswscale | |
| parent | 3ce0eddeab39bf04748c1153ae096e81facd0a6d (diff) | |
| parent | ecab1c77410f023b437c6ed3a3281be8f039e574 (diff) | |
| download | ffmpeg-8dbf98e68a9b7d92705661a2d6900c6d914a8068.tar.gz | |
Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'
* commit 'ecab1c77410f023b437c6ed3a3281be8f039e574':
oggdec: add support for Opus in Ogg demuxing
Conflicts:
Changelog
libavformat/oggparseopus.c
libavformat/version.h
See: e62fd6619f7aa91956a1b4ccfa7b0b8d7bc4ba90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions