diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-11 12:22:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-11 12:25:03 +0200 |
| commit | e76c34d08c6f90ed3d6402fa800081e20ddbc012 (patch) | |
| tree | 60a62f1755e0091fe6d833ac8b63be290b99312c /ffserver_config.c | |
| parent | 0303d43964cdcab868d3f765282c00086f3a8123 (diff) | |
| parent | 87f98a2b9d4c7218ad82bb45347a53b65e5244f3 (diff) | |
Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'
* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3':
fbdev: Support the RGB565 colour space.
Conflicts:
libavdevice/fbdev_dec.c
See: 43d36599fe3330913c6be9da5519dee048263dc9
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffserver_config.c')
0 files changed, 0 insertions, 0 deletions