diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 13:07:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 13:07:20 +0200 |
commit | 2288c776897076a5f7f5cc772836592798160423 (patch) | |
tree | 0f85650aaad1909389c64a0917ea5d5a6065f37e /doc/ffmpeg-utils.texi | |
parent | e4c0f258d38a961aff463c8474936771be7c561e (diff) | |
parent | 311a592dfcfc20b601a592472b36593351cf32c3 (diff) | |
download | ffmpeg-2288c776897076a5f7f5cc772836592798160423.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Remove some duplicate function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg-utils.texi')
0 files changed, 0 insertions, 0 deletions