Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'
* commit 'a1e2caa93e4f8102666a21222f01b74838b6497f': mov: Log format rather than fourcc in stsd in trace mode Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
- Loading branch information