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
..
Makefile Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e' 2014-07-19 13:39:12 +02:00
alldevices.c
alsa-audio-common.c
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h
avdeviceres.rc
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
decklink_enc.cpp
decklink_enc.h
decklink_enc_c.c
dshow.c lavd/dshow: use av_codec_get_id() 2014-08-07 13:03:17 +02:00
dshow_capture.h
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dv1394.c
dv1394.h
fbdev_common.c
fbdev_common.h
fbdev_dec.c Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46' 2014-07-18 21:48:37 +02:00
fbdev_enc.c
file_open.c
gdigrab.c
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
libdc1394.c
openal-dec.c
opengl_enc.c fix various typos 2014-06-03 10:58:19 -08:00
opengl_enc_shaders.h
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
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
pulse_audio_common.c
pulse_audio_common.h
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
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c
timefilter.h
v4l.c
v4l2-common.c
v4l2-common.h
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
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