Merge commit '728685f37ab333ca35980bd01766c78d197f784a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 17:02:42 +0000 (18:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 17:03:43 +0000 (18:03 +0100)
commit62a82c66cd3f03e045867471c5edcc84b4d2b54e
treeed8a8d99a235f959088b28fe131c6c4e5fcbe610
parentb44456c908965231160f9b8f88de8c0dc447aa1f
parent728685f37ab333ca35980bd01766c78d197f784a
Merge commit '728685f37ab333ca35980bd01766c78d197f784a'

* commit '728685f37ab333ca35980bd01766c78d197f784a':
  Add a side data type for audio service type.

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
libavfilter/af_ashowinfo.c
libavutil/frame.h
libavutil/version.h