diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:04:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:04:02 +0200 |
| commit | e5397513b93d356ffec8e401e18cb8e8d89e2077 (patch) | |
| tree | 5d46d32e4520673d04dd5f2beb88519e7639bfd7 /libavcodec/dnxhddec.c | |
| parent | 4b28907e4a947b7697fa44d5a80b6675ab152cc0 (diff) | |
| parent | 8fc11abe1fea4f211cc7dbd58a173d1221627d90 (diff) | |
Merge commit '8fc11abe1fea4f211cc7dbd58a173d1221627d90'
* commit '8fc11abe1fea4f211cc7dbd58a173d1221627d90':
mkv: Print unsupported mov tags when found
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddec.c')
0 files changed, 0 insertions, 0 deletions