aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg-utils.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-22 13:07:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-22 13:07:20 +0200
commit2288c776897076a5f7f5cc772836592798160423 (patch)
tree0f85650aaad1909389c64a0917ea5d5a6065f37e /doc/ffmpeg-utils.texi
parente4c0f258d38a961aff463c8474936771be7c561e (diff)
parent311a592dfcfc20b601a592472b36593351cf32c3 (diff)
downloadffmpeg-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