ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Jun 24
20:32:12 2015 +0200| [8e2fcd1cb4be938768db74af5c08350df6a156d7] | committer:
Michael Niedermayer
Merge commit '5a79bf0284a37855636390e620d189a964214c9e'
* commit '5a79bf0284a37855636390e620d189a964214c9e':
PCM signed 16-bit big-endian planar decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c
See: 9ba41ae63e079198ef4a9e83b5fa147e20966bdb
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e2fcd1cb4be938768db74af5c08350df6a156d7
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
