libavdevice/fbdev_common.c · ba8a1d161820f9e5f1485118a0f508e312f69a8b · libremedia / Tethys / FFmpeg

9 years ago

Michael Niedermayer authored 9 years ago


* commit '87f98a2b':
  fbdev: Support the RGB565 colour space.

Conflicts:
	libavdevice/fbdev_dec.c

See: 43d36599
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

e76c34d0

History

Merge commit ''

Michael Niedermayer authored 9 years ago


* commit '87f98a2b':
  fbdev: Support the RGB565 colour space.

Conflicts:
	libavdevice/fbdev_dec.c

See: 43d36599
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

fbdev_common.c 4.57 KiB