ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Mar 17
21:08:12 2015 +0100| [07ca090e814e3f93680fdef555f3688822a0cdbd] | committer:
Michael Niedermayer
Merge commit '4326bc364b58e97fc3d89417054a6b7610179a00'
* commit '4326bc364b58e97fc3d89417054a6b7610179a00':
lavf: Do not list mov-only codecs in riff tags
Conflicts:
libavformat/Makefile
libavformat/avidec.c
See: 2e0b5f5c90a4bc1440703ba5e8bf7139ff42f367
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07ca090e814e3f93680fdef555f3688822a0cdbd
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
