Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 00:09:13 +0000 (02:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 00:09:13 +0000 (02:09 +0200)
commita71fcfad892c4c59a011556f70b998aca1139b37
treeaf961a49102589bc3e8ca8ea93d969428f1e05de
parent329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8
parent9325d88eba8038b3e2a4485e473a018410379e2d
Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'

* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
  lavc: remove obsolete and disabled avpriv functions

Conflicts:
libavcodec/dv_profile.c
libavcodec/dv_profile.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/adx.c
libavcodec/adx.h
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/flac.c
libavcodec/flac.h