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)
* commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45':
  v210: Use separate sample_factors

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

Simple merge
Simple merge
Simple merge