Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:11:52 +0000 (19:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:12:13 +0000 (19:12 +0100)
commit935d0ee08d0ef964c02556fc694f1e8b3b69d7d4
tree5ff3fb0994ad98c28dca401dcbed4a5d4a0db7ff
parent7592d30bcb95427c3173b7dd2b4d68f7083c5a9c
parenteb5920c195d1b0bda81782af4ba0c5982f5225b3
Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'

* commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3':
  lavc: deprecate unused FF_BUG_OLD_MSMPEG4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h