[FFmpeg-cvslog] Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'
Michael Niedermayer
git at videolan.org
Sat Jul 11 12:47:53 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Jul 11 12:22:44 2015 +0200| [e76c34d08c6f90ed3d6402fa800081e20ddbc012] | committer: Michael Niedermayer
Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'
* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3':
fbdev: Support the RGB565 colour space.
Conflicts:
libavdevice/fbdev_dec.c
See: 43d36599fe3330913c6be9da5519dee048263dc9
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e76c34d08c6f90ed3d6402fa800081e20ddbc012
---
More information about the ffmpeg-cvslog
mailing list