Merge commit '117b432748ca87de4cd0f09d9b1495545e264733'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Mar 2015 21:20:17 +0000 (22:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Mar 2015 21:38:53 +0000 (22:38 +0100)
commita048bd44b2563dc453e0c97bdca60cf028feaf50
tree9160697af0c020fe8841326e81eff6e08670cd11
parent79f013a206394bfc90bbb72995f5cf8965181f51
parent117b432748ca87de4cd0f09d9b1495545e264733
Merge commit '117b432748ca87de4cd0f09d9b1495545e264733'

* commit '117b432748ca87de4cd0f09d9b1495545e264733':
  lavc: Introduce AVCodec internal capabilities

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/utils.c