diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-19 14:07:23 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-19 14:07:23 +0000 |
| commit | c63847528219e8e14735ac4778d53242f58afb21 (patch) | |
| tree | e2989e6a9ad0d06266b06f6a8434e16c306f4144 /libavformat/matroskadec.c | |
| parent | 58fba4b02f65e8f9878cd5e41d24bb8e452f6631 (diff) | |
| parent | 73b03249133d6631520089798087cbd963eed9ca (diff) | |
| download | ffmpeg-c63847528219e8e14735ac4778d53242f58afb21.tar.gz | |
Merge commit '73b03249133d6631520089798087cbd963eed9ca'
* commit '73b03249133d6631520089798087cbd963eed9ca':
aiff: Support demuxing G.722 streams
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/matroskadec.c')
0 files changed, 0 insertions, 0 deletions