aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libopus.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-09 21:03:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-09 21:07:24 +0200
commitfe25194c5870f21ba10f615f036b64d0c84fca48 (patch)
treeec4aa330575d647588e90d2201cc54d5d1b1c174 /libavcodec/libopus.h
parent71288bf80f37bdc0795396930d8b97c781c94587 (diff)
parentc201069fac9a76e6604f9d84d76a172434d62200 (diff)
downloadffmpeg-fe25194c5870f21ba10f615f036b64d0c84fca48.tar.gz
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>
Diffstat (limited to 'libavcodec/libopus.h')
0 files changed, 0 insertions, 0 deletions