diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 12:24:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 12:48:03 +0200 |
| commit | 83d100baea7ae9549ac189772a62d83dc6bc48e4 (patch) | |
| tree | 0b1fb04e46290ea94fd84ed5f2dddd67dc4803ff /libavutil | |
| parent | 593dc5aed907594753862828a461f58b5d48a0e0 (diff) | |
| parent | 2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb (diff) | |
Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'
* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
lavf: group dump functions together
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions