diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 19:02:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-08 19:02:46 +0100 |
| commit | 0c4bf87b296145e38510655d1a14196493d5c54e (patch) | |
| tree | 63eb4722659980ba21abe4b72ab8a2f0e48f8a57 /cmdutils_common_opts.h | |
| parent | b08f554fdc0886ab9815b2e3db3ae8a93baa57c8 (diff) | |
| parent | cde7df25ef74b85b5ce11d9171779f28f0c12d15 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Mirillis FIC video decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_common_opts.h')
0 files changed, 0 insertions, 0 deletions