Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:31:50 +0000 (16:31 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:31:50 +0000 (16:31 -0300)
commit2ccd00dabd5ab4fa2550377be823a521df80c141
tree6a91d11df569a791c8925cb7efc5c57a09ca152f
parent5a2e581879b8901b8660b82ff8d333d18fc629ff
parent5182a28b5de060c51c21b36053ab205bfbbbbe31
Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'

* commit '5182a28b5de060c51c21b36053ab205bfbbbbe31':
  lavc: Drop deprecated global afd field

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/avcodec.h
libavcodec/h264dec.c
libavcodec/mpeg12dec.c
libavcodec/options_table.h
libavcodec/pthread_frame.c
libavcodec/version.h