Merge commit '1482aff2048511b821ff9feac19426113cc641a2'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 16:38:04 +0000 (16:38 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 16:42:32 +0000 (16:42 +0000)
commitb986a4625d0e67710f155a9816dbab186a98020e
tree118c89f94a652571276175a55de0f4b21e00faea
parentc79252897096b89376bcf17a5bca6cdf8d21b6a0
parent1482aff2048511b821ff9feac19426113cc641a2
Merge commit '1482aff2048511b821ff9feac19426113cc641a2'

* commit '1482aff2048511b821ff9feac19426113cc641a2':
  lavc: Move noise_reduction to codec private options

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