1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
FFmpeg/libavdevice
Michael Niedermayer e76c34d08c Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'
* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3':
  fbdev: Support the RGB565 colour space.

Conflicts:
	libavdevice/fbdev_dec.c

See: 43d36599fe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-11 12:25:03 +02:00
..
alldevices.c
alsa_dec.c doc: avoid incorrect phrase 'allows to' 2015-06-16 21:48:51 +02:00
alsa_enc.c doc: avoid incorrect phrase 'allows to' 2015-06-16 21:48:51 +02:00
alsa.c
alsa.h
avdevice.c
avdevice.h doc: avoid incorrect phrase 'allows to' 2015-06-16 21:48:51 +02:00
avdeviceres.rc
avfoundation.m
bktr.c
caca.c
decklink_common_c.h
decklink_common.cpp
decklink_common.h
decklink_dec_c.c
decklink_dec.cpp
decklink_dec.h
decklink_enc_c.c
decklink_enc.cpp
decklink_enc.h
dshow_capture.h
dshow_common.c
dshow_crossbar.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c
dv1394.c
dv1394.h
fbdev_common.c Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3' 2015-07-11 12:25:03 +02:00
fbdev_common.h
fbdev_dec.c
fbdev_enc.c
file_open.c
gdigrab.c
iec61883.c Remove a few occurences of "long long" from the libraries. 2015-06-13 09:28:41 +02:00
internal.h
jack.c Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a' 2015-06-08 22:48:14 +02:00
lavfi.c avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet() 2015-06-10 00:56:02 +02:00
libavdevice.v
libcdio.c
libdc1394.c
Makefile
openal-dec.c avdevice/openal-dec: Make al_format_info const 2015-06-11 00:48:41 +02:00
opengl_enc_shaders.h
opengl_enc.c
oss_dec.c
oss_enc.c
oss.c
oss.h
pulse_audio_common.c
pulse_audio_common.h
pulse_audio_dec.c
pulse_audio_enc.c
qtkit.m
sdl.c
sndio_dec.c
sndio_enc.c
sndio.c
sndio.h
timefilter.c
timefilter.h
utils.c
v4l2-common.c
v4l2-common.h
v4l2.c
v4l2enc.c
v4l.c
version.h lavd: Add library identifier 2015-07-01 00:13:58 +01:00
vfwcap.c
x11grab.c
xcbgrab.c xcbgrab: Explicitly include xcb/shape.h 2015-07-06 20:00:34 +02:00
xv.c