ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Mar 13
23:17:54 2015 +0100| [e1f37c48e54f98d34f8a032e1d96f7a135a8545d] | committer:
Michael Niedermayer
Merge commit '247e370e2a913db52ca079b347a174c8d393b171'
* commit '247e370e2a913db52ca079b347a174c8d393b171':
TDSC decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1f37c48e54f98d34f8a032e1d96f7a135a8545d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
