aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/avformat.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-07-03 03:20:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-07-03 03:22:48 +0200
commite15e78f391abf4e037352cd783f6fa3c6b843d94 (patch)
treebc2b1e5e48a071f56f1cdcc4e40cfc11ded77d53 /tests/fate/avformat.mak
parent2778fdbe5424485d135a37d384d6449113a6c2b5 (diff)
parent1316df7aa98c4784f190d107206d0bb12c590b89 (diff)
downloadffmpeg-e15e78f391abf4e037352cd783f6fa3c6b843d94.tar.gz
Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'
* commit '1316df7aa98c4784f190d107206d0bb12c590b89': lavu: add an API function to return the Libav version string Conflicts: .gitignore Makefile cmdutils.c doc/APIchanges libavutil/avutil.h libavutil/utils.c See: f91126643a91c2d3f8d8e210c8facaf259951b03 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/avformat.mak')
0 files changed, 0 insertions, 0 deletions