diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 10:58:44 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 10:58:44 +0100 |
commit | 14ab6f9a268a5f0039f0eb4b8ed91c3652d4d0a7 (patch) | |
tree | a8088d2f8701812856553ad5e02586c092018ef6 /libavutil/dict.h | |
parent | f063a0b33ddbafaa4a31e747bf4b445de1a8e8a8 (diff) | |
parent | 96a06dbaf278e8152487e08772946f63bd2a3843 (diff) | |
download | ffmpeg-14ab6f9a268a5f0039f0eb4b8ed91c3652d4d0a7.tar.gz |
Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'
* commit '96a06dbaf278e8152487e08772946f63bd2a3843':
FATE: add support for testing hwaccels
Conflicts:
tests/Makefile
tests/fate-run.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/dict.h')
0 files changed, 0 insertions, 0 deletions