diff options
| author | Michael Niedermayer <[email protected]> | 2015-07-01 04:15:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-07-01 04:15:27 +0200 |
| commit | 55a04a5d7a90a2eddcfe1fe407c403ba95b281b8 (patch) | |
| tree | bcd8be47748d8f15f79d32ff47060ed521aa5534 /libavformat/concatdec.c | |
| parent | 35c8dda5c2dbeb37c659f964372edf6f2bde3b5f (diff) | |
| parent | a1e2caa93e4f8102666a21222f01b74838b6497f (diff) | |
Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'
* commit 'a1e2caa93e4f8102666a21222f01b74838b6497f':
mov: Log format rather than fourcc in stsd in trace mode
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/concatdec.c')
0 files changed, 0 insertions, 0 deletions