Merge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:23:32 +0000 (17:23 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 17:23:32 +0000 (17:23 +0000)
commit04e4166536d3fb51ee9b9361de2a414fa876ab6e
tree6c46410d8346b3590e086abf4d2a0986aa37c923
parent6bff2b5f6a3dca43bf553866b0f110c47d4ec72d
parente280fe13291e9c712a5f4aa13b5263f3e8afed45
Merge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'

* commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45':
  v210: Use separate sample_factors

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/v210enc.c
libavcodec/v210enc.h
libavcodec/x86/v210enc_init.c