Merge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:19:38 +0000 (16:19 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:19:38 +0000 (16:19 -0300)
commitb79a7da36faa6bb5914b04800b548e99eb3b81ca
tree517d15684e3fcccd66b42b75ff94030e4843cfe3
parent6e69525e6984d51165de0b17b796bbc29f9dd6e7
parentbb45d11282d93af0e8d4c8fd6bc6405f7439a940
Merge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940'

* commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940':
  lavc: Drop deprecated codec flags

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