diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:31:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 21:31:26 +0100 |
| commit | dfe5a9f022b38ba292212ce2daff60221e411e10 (patch) | |
| tree | b641963626d99ac6db929e48367b67f9d8140df6 /libavformat/allformats.c | |
| parent | 99bcfe62278ffc11e2665e653dcb90336ec8d7ff (diff) | |
| parent | c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b (diff) | |
Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
lavc: Add DSS SP decoder
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
0 files changed, 0 insertions, 0 deletions