Michael Niedermayer 20be5e0a0e Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91' ...

* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
  Disable deprecation warnings for cases where a replacement is available

Conflicts:
	libavcodec/avpacket.c
	libavcodec/pthread.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-08-03 10:08:30 +02:00

..

alldevices.c

lavd: add xv output device

2013-05-30 10:44:54 +02:00

alsa-audio-common.c

…

alsa-audio-dec.c

…

alsa-audio-enc.c

…

alsa-audio.h

…

avdevice.c

…

avdevice.h

…

bktr.c

…

caca.c

…

dshow_capture.h

…

dshow_common.c

…

dshow_enummediatypes.c

…

dshow_enumpins.c

…

dshow_filter.c

…

dshow_pin.c

…

dshow.c

…

dv1394.c

…

dv1394.h

…

fbdev.c

avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE

2013-07-26 15:21:25 +00:00

iec61883.c

…

jack_audio.c

…

lavfi.c

avdevice/lavfi: fix input with unknown channel layout

2013-07-13 23:10:05 +02:00

libavdevice.v

…

libcdio.c

…

libdc1394.c

…

Makefile

lavd: add xv output device

2013-05-30 10:44:54 +02:00

openal-dec.c

…

oss_audio.c

…

pulse.c

…

sdl.c

…

sndio_common.c

…

sndio_common.h

…

sndio_dec.c

…

sndio_enc.c

…

timefilter.c

avdevice/timefilter-test: dont try to optimize par1 for n0=0 case

2013-08-02 17:06:13 +02:00

timefilter.h

…

v4l2-common.c

…

v4l2-common.h

…

v4l2.c

Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'

2013-08-03 10:08:30 +02:00

v4l2enc.c

lavd/v4l2enc: check write return value.

2013-05-20 16:33:21 +02:00

v4l.c

…

version.h

avformat/AVFormatContext: Move fields down to match the fork

2013-07-09 19:06:32 +02:00

vfwcap.c

…

x11grab.c

avdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE

2013-07-26 15:21:21 +00:00

xv.c

lavd: add xv output device

2013-05-30 10:44:54 +02:00