Michael Niedermayer 2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' ...

* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

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

2013-03-08 19:12:03 +01:00

..

alldevices.c

Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'

2013-01-04 13:01:54 +01:00

alsa-audio-common.c

lavd/alsa: simplify reordering functions definition.

2013-02-02 14:13:11 +01:00

alsa-audio-dec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

alsa-audio-enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

alsa-audio.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

avdevice.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

avdevice.h

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

bktr.c

bktr: fix warning: missing braces around initializer

2012-12-29 19:27:07 +01:00

caca.c

caca: fix 10l typo

2012-10-12 19:05:58 +02:00

dshow_capture.h

dshow: handle events in graph

2012-12-17 03:44:12 -02: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: rename dshow.h to avoid conflict with system header of equal name

2012-05-24 14:15:10 +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: Use NO_DSHOW_STRSAFE for all dshow header inclusions

2012-11-16 19:26:13 +01:00

dshow.c

dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.

2013-02-15 00:08:12 +01:00

dv1394.c

dv1394: Swap the min and max values of the 'standard' option

2012-11-02 11:25:48 +02:00

dv1394.h

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00

fbdev.c

Merge remote-tracking branch 'qatar/master'

2012-10-12 17:21:01 +02:00

iec61883.c

Update iec61883 to handle multiple devices, and allow

2012-11-13 19:44:21 +01:00

jack_audio.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

lavfi.c

avformat/lavfi: force probesize to cover at least 30 frames

2013-02-28 20:28:59 +01:00

libavdevice.v

Add symbol versioning for shared libraries

2010-01-16 04:49:02 +00:00

libcdio.c

libcdio: support recent cdio-paranoia

2013-01-17 21:41:18 +01:00

libdc1394.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

openal-dec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

oss_audio.c

oss: warn when non block mode cannot be enabled.

2012-11-05 00:28:21 +01:00

pulse.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

sdl.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02: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

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

sndio_enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

timefilter.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

timefilter.h

timefilter: allow to evaluate at other times.

2012-04-04 14:32:44 +02:00

v4l2.c

Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'

2013-03-08 19:12:03 +01:00

v4l.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

version.h

lavd/v4l2: add list_standards option

2013-01-31 12:38:03 +01:00

vfwcap.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

x11grab.c

x11grab: fix mixed declaration and code

2012-10-29 22:24:10 +01:00