diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 02:48:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 02:48:19 +0200 |
| commit | 8e8219e0f0725116809cdd1c17c868cb08da0dec (patch) | |
| tree | eccf6f91c9ff4d49aaa71727640934cec80fcfa0 /libavformat/mpeg.c | |
| parent | 93db2708d3b0bcc1f1d87d23ae8adbedd8ea6660 (diff) | |
| parent | c253340ae6f74ffd8798bbd476e46d1b33a2d56e (diff) | |
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/mpeg.c')
0 files changed, 0 insertions, 0 deletions