Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 16:54:26 +0000 (16:54 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 16:57:04 +0000 (16:57 +0000)
commit5b0d4c247a3c3ba8a8ece70b31354121645c8320
tree9fe83a0d04bff7be533c99a6774c3ecfd529e50c
parent0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e
parent96c373c7704aeb1cc1d2c275fbb5d71777665589
Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'

* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
  lavc: Move context_model to codec private options

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