Changeset fe25194c in ffmpeg

Timestamp:

Apr 9, 2015, 7:07:24 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

259fd4c7

Parents:

71288bf8 (diff), c201069 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/09/15 19:03:39)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/09/15 19:07:24)

Message:

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

• commit 'c201069fac9a76e6604f9d84d76a172434d62200': avdevice: Add missing header for NULL_IF_CONFIG_SMALL

Conflicts:

libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/pulse_audio_dec.c
libavdevice/sndio_enc.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavdevice/xcbgrab.c

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

(No files)