aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/oggparseskeleton.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-09 21:36:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-09 21:36:42 +0200
commitb1b58310d09297eb8e64b156e6da3406bc866cce (patch)
tree9314f08b45e3e58b6afb667d4f30a05dabe497e0 /libavformat/oggparseskeleton.c
parent259fd4c7cfb8afbb022921b44fe6611fcefff3b1 (diff)
parent8d26c193fb42d08602ac93ece039d4718d029adc (diff)
downloadffmpeg-b1b58310d09297eb8e64b156e6da3406bc866cce.tar.gz
Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'
* commit '8d26c193fb42d08602ac93ece039d4718d029adc': avdevice: Apply a more consistent file naming scheme Conflicts: libavdevice/Makefile libavdevice/alsa.h libavdevice/alsa_dec.c libavdevice/alsa_enc.c libavdevice/sndio_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseskeleton.c')
0 files changed, 0 insertions, 0 deletions