aboutsummaryrefslogtreecommitdiffstats
path: root/tools/seek_print.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-29 20:09:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-29 20:24:42 +0200
commit31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f (patch)
treec2854dbdc4da5a38bf9b791e7288ae9b3d7688c9 /tools/seek_print.c
parente066f01539fd2ed19bda2031c43ddf266f0a000a (diff)
parent69e7336b8e16ee65226fc20381baf537f4b125e6 (diff)
downloadffmpeg-31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f.tar.gz
Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'
* commit '69e7336b8e16ee65226fc20381baf537f4b125e6': avstring: Expose the simple name match function Conflicts: libavutil/avstring.c libavutil/avstring.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/seek_print.c')
0 files changed, 0 insertions, 0 deletions