Michael Niedermayer 25b243759c Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0' ...

* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
  avutil: Move library version related macros to version.h

Conflicts:
	libavcodec/version.h
	libavresample/version.h
	libavutil/avutil.h
	libavutil/utils.c

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

2013-12-27 12:01:23 +01:00

..

alldevices.c

lavd: add fbdev output device

2013-10-24 08:16:17 +02:00

alsa-audio-common.c

lavd/alsa: simplify reordering functions definition.

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

alsa-audio-dec.c

alsa-audio-dec: explicitly cast the delay to a signed int64

2013-12-03 12:04:26 +01:00

alsa-audio-enc.c

lavd/alsa: add stream validation

2013-11-03 10:28:15 +01:00

alsa-audio.h

lavd/alsa: fix timestamp calculation

2013-11-03 10:28:15 +01: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

avdeviceres.rc

Add Windows resource file support for shared libraries

2013-12-05 23:42:07 +01:00

bktr.c

Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'

2013-08-10 10:29:44 +02: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_pin: dont return a value from a void function

2013-03-25 22:12:07 +01:00

dshow.c

lavu,lavfi,lavd: do not hardcode AV_PIX_FMT_NB value when setting pixel format max value

2013-12-26 11:35:27 +01:00

dv1394.c

Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

2013-08-08 11:36:21 +02:00

dv1394.h

miscellaneous typo fixes

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

fbdev_common.c

lavd/fbdev_enc: add default device

2013-12-06 19:15:47 +01:00

fbdev_common.h

lavd/fbdev_enc: add default device

2013-12-06 19:15:47 +01:00

fbdev_dec.c

lavd/fbdev: move common code to separate file

2013-10-24 08:45:59 +02:00

fbdev_enc.c

lavd/fbdev_enc: add default device

2013-12-06 19:15:47 +01:00

file_open.c

libavutil: Make avpriv_open a library-internal function on msvcrt

2013-08-10 00:53:33 +03:00

iec61883.c

Update iec61883 to handle multiple devices, and allow

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

jack_audio.c

timefilter: Handle memory allocation failure

2013-10-29 11:40:04 +00:00

lavfi.c

lavd/lavfi: support unknown channel layouts.

2013-11-03 10:29:53 +01:00

libavdevice.v

…

libcdio.c

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

libdc1394.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

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

Makefile

Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'

2013-12-09 20:52:14 +01:00

openal-dec.c

avformat/avdevice: add missing time.h includes

2013-03-12 15:28:22 +01:00

oss_audio.c

Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'

2013-08-08 11:36:21 +02:00

pulse_audio_common.c

lavd/pulse: add ff_ prefix and fix param type

2013-11-04 00:47:00 +01:00

pulse_audio_common.h

lavd/pulse: add ff_ prefix and fix param type

2013-11-04 00:47:00 +01:00

pulse_audio_dec.c

lavd/pulse: add ff_ prefix and fix param type

2013-11-04 00:47:00 +01:00

pulse_audio_enc.c

lavd/pulse_audio_enc: add buffer size control options

2013-11-27 10:12:54 +01:00

sdl.c

lavd/sdl: add delay when no events are found in the event queue

2013-11-26 18:38:48 +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

sndio_dec: Add missing includes for av_gettime()

2013-03-24 13:20:53 +02:00

sndio_enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02: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

lavd/v4l2: move pixel format conversion code to a separate place.

2013-05-20 01:11:28 +02: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

timefilter: Handle memory allocation failure

2013-10-27 19:14:23 +00:00

v4l2enc.c

lavd/v4l2enc: check write return value.

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

v4l.c

avdevice/v4l: remove duplicate include

2013-09-21 15:36:33 +02:00

version.h

Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'

2013-12-27 12:01:23 +01:00

vfwcap.c

avdevice/vfwcap: make constant arrays static

2013-08-03 22:24:31 +02:00

x11grab.c

lavd/x11grab: Support AV_PIX_FMT_PAL8.

2013-10-24 11:56:36 +02:00

xv.c

lavd/xv: free resources on errors

2013-11-15 09:56:58 +01:00