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)
* commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3':
  lavc: deprecate unused FF_BUG_OLD_MSMPEG4

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

Simple merge
Simple merge
Simple merge