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)
* commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31':
  avio: Rename avclass symbols relating to avio

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

Simple merge
Simple merge
Simple merge