ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed May 13
22:04:02 2015 +0200| [e5397513b93d356ffec8e401e18cb8e8d89e2077] | committer:
Michael Niedermayer
Merge commit '8fc11abe1fea4f211cc7dbd58a173d1221627d90'
* commit '8fc11abe1fea4f211cc7dbd58a173d1221627d90':
mkv: Print unsupported mov tags when found
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5397513b93d356ffec8e401e18cb8e8d89e2077
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog