Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 20:18:04 +0000 (20:18 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 20:18:04 +0000 (20:18 +0000)
commit2e9b995e4f7f6457a36331e66fb78a5676cd9b25
tree1134c54348410c273ee9bf04101445ffbbc7cc39
parent11e6f13a13302dae18a1a83dac72fd9df0a69139
parent0e6c8532215790bbe560a9eea4f3cc82bb55cf92
Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'

* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
  lavc: Move b_frame_strategy and b_sensitivity to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 files changed:
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/qsvenc.c
libavcodec/qsvenc.h
libavcodec/qsvenc_h264.c
libavcodec/qsvenc_hevc.c
libavcodec/qsvenc_mpeg2.c
libavcodec/version.h