Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 15:17:42 +0000 (16:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 15:17:42 +0000 (16:17 +0100)
commitbe023405a7cdbdd6b5d163de8beb1968ee4ef52e
tree19de2dcd0a29d535729e8dfde16d06ddfc275866
parent392080cbe52868c00f8dfd4e60639c37a13165f4
parentf771b3ab5d3c0b763ee356152be550f4121babd0
Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'

* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
  avidec: do not export stream_codec_tag

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c
libavformat/avidec.c