Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 21:18:08 +0000 (22:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 21:18:08 +0000 (22:18 +0100)
commit5beddbc4cf81fc29866981cdf62de76299627ed0
treea04caf5439ebe5172b8047d47faaa241c766fe25
parente052f06531c400a845092a7e425ef97834260b3b
parent2a113695238e7675ab75c5fb9a5f59fc92f2ddd9
Merge commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9'

* commit '2a113695238e7675ab75c5fb9a5f59fc92f2ddd9':
  lavc: remove disabled FF_API_INTER_THRESHOLD cruft
  lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
  lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft

Conflicts:
libavcodec/version.h

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