aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-19 12:12:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-19 12:23:45 +0100
commit4e469842b5254dda261223a23e53c5a0f539544d (patch)
tree56452f1f01694d11a51b7c02190ea0c201028c2a /Makefile
parent03b711d95e28c402763b1da42109ab5b63cc711f (diff)
parent202b5f6deb65e405b07b9b5c20f97c8cb925cf49 (diff)
downloadffmpeg-4e469842b5254dda261223a23e53c5a0f539544d.tar.gz
Merge commit '202b5f6deb65e405b07b9b5c20f97c8cb925cf49'
* commit '202b5f6deb65e405b07b9b5c20f97c8cb925cf49': doc: Fix some obsolete references to av* tools as ff* tools Conflicts: doc/demuxers.texi No code changes, merge for metadata only Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions