Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 22:02:36 +0000 (23:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 22:02:42 +0000 (23:02 +0100)
commit1fb3642317768c02db0eaf8d0d118d37a970f091
tree821e7babb15f70691bbab2b5207b158e56eaa6c5
parente8565d21c276ab9ac5ce785549420321fbd0b093
parentc86d8aed748adc3ba8df96fb1fe14aa45da77a31
Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'

* commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31':
  avio: Rename avclass symbols relating to avio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avio_internal.h
libavformat/aviobuf.c
libavformat/options.c