1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavdevice
Michael Niedermayer fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:00:50 +02:00
..
alldevices.c Add AVFoundation input device. 2014-04-11 17:51:33 +02:00
alsa-audio-common.c lavd/alsa: simplify reordering functions definition. 2013-02-02 14:13:11 +01:00
alsa-audio-dec.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
alsa-audio-enc.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
alsa-audio.h lavd/alsa: fix timestamp calculation 2013-11-03 10:28:15 +01:00
avdevice.c lavd: no default device unless explicitly set 2014-04-12 19:14:57 +02:00
avdevice.h Various small spelling fixes. 2014-04-22 20:44:31 +02:00
avdeviceres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
avfoundation.m lavd/avfoundation: Add device category. 2014-08-05 01:36:26 +02:00
bktr.c Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46' 2014-07-18 21:48:37 +02:00
caca.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
decklink_enc_c.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
decklink_enc.cpp lavd: add decklink output device 2014-02-09 17:15:19 +01:00
decklink_enc.h lavd: add decklink output device 2014-02-09 17:15:19 +01:00
dshow_capture.h dshow: show device name when outputting buffer overflow log message 2014-03-28 00:22:55 +01:00
dshow_common.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enummediatypes.c dshow: fixup some COM objects, based on patches from Don Moir 2014-03-31 23:11:35 +02:00
dshow_enumpins.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_filter.c dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions 2012-11-16 19:26:13 +01:00
dshow_pin.c dshow: show device name when outputting buffer overflow log message 2014-03-28 00:22:55 +01:00
dshow.c lavd/dshow: use av_codec_get_id() 2014-08-07 13:03:17 +02:00
dv1394.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
dv1394.h miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
fbdev_common.c lavd/fbdev_enc: move list device code to fbdev_common 2014-04-30 00:35:42 +02:00
fbdev_common.h lavd/fbdev_enc: move list device code to fbdev_common 2014-04-30 00:35:42 +02:00
fbdev_dec.c Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46' 2014-07-18 21:48:37 +02:00
fbdev_enc.c lavd/fbdev_enc: move list device code to fbdev_common 2014-04-30 00:35:42 +02:00
file_open.c libavutil: Make avpriv_open a library-internal function on msvcrt 2013-08-10 00:53:33 +03:00
gdigrab.c Add Win32 GDI-based screen grabbing 2014-04-03 00:41:45 +02:00
iec61883.c lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*() 2014-08-07 04:28:11 +02:00
jack_audio.c Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46' 2014-07-18 21:48:37 +02:00
lavfi.c avdevice/lavfi: Simplify non-AV stream check 2014-08-07 15:41:17 +02:00
libavdevice.v
libcdio.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
libdc1394.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
Makefile Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 2014-07-19 13:39:12 +02:00
openal-dec.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
opengl_enc_shaders.h lavd/opengl_enc_shaders: fix gray* shader 2014-02-16 19:56:53 +01:00
opengl_enc.c fix various typos 2014-06-03 10:58:19 -08:00
oss_audio_dec.c Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 2014-07-19 13:39:12 +02:00
oss_audio_enc.c Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 2014-07-19 13:39:12 +02:00
oss_audio.c avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue 2014-07-31 21:19:15 +02:00
oss_audio.h Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 2014-07-19 13:39:12 +02:00
pulse_audio_common.c lavd/pulse_audio_common: add context helper functions 2014-04-18 01:42:17 +02:00
pulse_audio_common.h lavd/pulse_audio_common: add context helper functions 2014-04-18 01:42:17 +02:00
pulse_audio_dec.c avdevice/pulse_audio_dec: reimplement using the non simple API 2014-07-09 01:36:01 +02:00
pulse_audio_enc.c avdevice/pulse_audio_enc: use getter function for AVFrame.channels 2014-07-28 20:06:11 +02:00
qtkit.m avdevice/qtkit: fix include 2014-04-24 05:12:07 +02:00
sdl.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
sndio_common.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
sndio_common.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
sndio_dec.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
sndio_enc.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
timefilter.c timefilter: Handle memory allocation failure 2013-10-29 11:40:04 +00:00
timefilter.h timefilter: Handle memory allocation failure 2013-10-29 11:40:04 +00:00
v4l2-common.c Add more Bayer colour spaces to the video4linux2 device wrapper. 2014-02-23 13:42:41 +01:00
v4l2-common.h lavd/v4l2: move pixel format conversion code to a separate place. 2013-05-20 01:11:28 +02:00
v4l2.c Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 2014-08-15 21:00:50 +02:00
v4l2enc.c v4l2enc: adding AVClass 2014-07-31 18:59:20 +02:00
v4l.c lavd: add categories to device implementations 2014-03-03 23:34:46 +01:00
version.h Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 2014-08-10 00:26:45 +02:00
vfwcap.c Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2' 2014-08-15 12:45:35 +02:00
x11grab.c lavd/x11grab: reindent after last commit. 2014-07-17 18:28:58 +02:00
xv.c avdevice/xv: fix missing { 2014-06-30 21:32:19 +02:00