lavc: remove disabled FF_API_MMI cruft
lavc: remove disabled FF_API_SNOW cruft
lavc: remove disabled FF_API_IDCT cruft
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
lavf: remove disabled FF_API_READ_PACKET cruft
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
lavf: remove disabled FF_API_AV_GETTIME cruft
Merge commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252'

* commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252':
  lavc: remove disabled FF_API_MMI cruft

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
bktr: add missing #include for av_gettime()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00'

* commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00':
  lavc: remove disabled FF_API_SNOW cruft

Conflicts:
	libavcodec/avcodec.h
	libavcodec/options_table.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68'

* commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
  lavc: remove disabled FF_API_IDCT cruft

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'

* commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6':
  lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft

Conflicts:
	libavformat/version.h

removial postponed as the wraper code is trivial

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavc: remove disabled 8SVX_RAW cruft

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'

* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
  lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft

Conflicts:
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847'

* commit '435c2a31ad5eead20eda1152097f60c3bfa22847':
  lavf: remove disabled FF_API_READ_PACKET cruft

Conflicts:
	libavformat/version.h

Removial postponed as wraper is trivial

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'

* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
  lavf: remove disabled FF_API_AV_GETTIME cruft
  lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft

Conflicts:
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat: postpone API removials where the functions are trivial wrapers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>