diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 11:25:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 11:25:29 +0100 |
commit | a7d451c1dd754c6345dfaa0d2416f1adba20ef08 (patch) | |
tree | 7ec3051bdfe8c7f3bc191cf8c14a39d6f0d878a8 /libswscale/arm | |
parent | ff9b21776b8d944838b3698f529447d287fe4ed0 (diff) | |
parent | e1ee0521a698809ed216e9e5c11bd2bbb466ed04 (diff) | |
download | ffmpeg-a7d451c1dd754c6345dfaa0d2416f1adba20ef08.tar.gz |
Merge remote-tracking branch 'github/master'
* github/master:
tests: Fix test name for pixfmts tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/arm')
0 files changed, 0 insertions, 0 deletions