Merge commit '247e370e2a913db52ca079b347a174c8d393b171'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Mar 2015 22:17:54 +0000 (23:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Mar 2015 22:23:01 +0000 (23:23 +0100)
commite1f37c48e54f98d34f8a032e1d96f7a135a8545d
tree74c11781b08a32228c081d6e679d778b6ac686a5
parentfa4bb7c5b249da60cd16113b795a64f0055ef164
parent247e370e2a913db52ca079b347a174c8d393b171
Merge commit '247e370e2a913db52ca079b347a174c8d393b171'

* commit '247e370e2a913db52ca079b347a174c8d393b171':
  TDSC decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/tdsc.c
libavcodec/version.h
libavformat/riff.c
tests/fate/video.mak
tests/ref/fate/tdsc