diff options
| author | Michael Niedermayer <[email protected]> | 2013-10-12 14:03:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-10-12 14:03:54 +0200 |
| commit | 23c8a3353bd948f4a69116124dc433c85909d86e (patch) | |
| tree | 4d992f5ed5291216815f8289fd4d7c093eb3c73b /libavformat/utils.c | |
| parent | aeddc6e3a552d094dfb890dd1f017421816e367b (diff) | |
| parent | a52b5a5a07b0d432f9bed90b6d56647f8d44fbce (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
riff: Add a mapping for VP6A
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions