ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Mar 29
12:47:10 2015 +0200| [93704e09c77e991e18c8bc1f0ab7f1e03062150e] | committer:
Michael Niedermayer
Merge commit '72025ac36c740f031d7e413041fdfe97087c83c4'
* commit '72025ac36c740f031d7e413041fdfe97087c83c4':
lavc: add libdcadec decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdcadec.c
See: 519868de7d9c99876efcaf57d6a9683c22732cde
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93704e09c77e991e18c8bc1f0ab7f1e03062150e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog