aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/bintext.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-20 02:48:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-20 02:48:19 +0200
commit8e8219e0f0725116809cdd1c17c868cb08da0dec (patch)
treeeccf6f91c9ff4d49aaa71727640934cec80fcfa0 /libavformat/bintext.c
parent93db2708d3b0bcc1f1d87d23ae8adbedd8ea6660 (diff)
parentc253340ae6f74ffd8798bbd476e46d1b33a2d56e (diff)
downloadffmpeg-8e8219e0f0725116809cdd1c17c868cb08da0dec.tar.gz
Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'
* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e': log: Introduce a more verbose debug level Conflicts: doc/APIchanges doc/fftools-common-opts.texi libavutil/log.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bintext.c')
0 files changed, 0 insertions, 0 deletions