Merge commit '5764d38173661c29d954711dd5abfddf709e9ba4'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 15:21:21 +0000 (15:21 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 15:22:19 +0000 (15:22 +0000)
commit7c6e86c0cec17dfc020d58c82f4f1af5fcaea6c1
tree55ab3a10f5d4333bfa6d4b628c404abe3d42922c
parent13be46c08e59141408f1a7afd4737826afa87f11
parent5764d38173661c29d954711dd5abfddf709e9ba4
Merge commit '5764d38173661c29d954711dd5abfddf709e9ba4'

* commit '5764d38173661c29d954711dd5abfddf709e9ba4':
  lavc: Move chromaoffset to codec private options

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