Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 18:50:46 +0000 (15:50 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 18:50:46 +0000 (15:50 -0300)
commit400ecd8e4059e0d6c587915bca5e7e11858cca33
tree7155baeba3628fedf437a527c7faed947585e3da
parent7bbe33b0526723f0a20c27e3b8d03b186b27fdf6
parent72dc7ddd18fe54ee68aec71590c3202ad009a8fc
Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'

* commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc':
  lavc: Drop deprecated error rate option

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