Merge commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 15:24:00 +0000 (15:24 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 15:24:00 +0000 (15:24 +0000)
commit30c1bdb87ce336f2b9957769e30a10d72f93d372
treee951a9601f2c36e424ec023e9b9fab9b843f8237
parent7c6e86c0cec17dfc020d58c82f4f1af5fcaea6c1
parent7c79587d7407dab4b9445d66b5f111fe657c8c4d
Merge commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d'

* commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d':
  lavc: Move scenechange_threshold to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h