diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-11 12:15:54 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-11 12:15:54 +0100 |
commit | c3a62d3507b231f4ac8cb17eb537024b8c497bc9 (patch) | |
tree | dfae224cba2ced8b0e3b951a83806bdeb0e268c9 /cmdutils.c | |
parent | 5d7009dac28bd448313e3d04327b2cb00446dc83 (diff) | |
parent | d46d87d1d3de41758b08c045d4b20f4b16ad21de (diff) | |
download | ffmpeg-c3a62d3507b231f4ac8cb17eb537024b8c497bc9.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sparc: dsputil_vis: Fix silly variable name search and replace typo
Conflicts:
libavcodec/sparc/dsputil_vis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions