Merge commit 'be69f0a800903b7573b18d9287d18b2f368b8b11'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:39:28 +0000 (14:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:39:32 +0000 (14:39 +0100)
* commit 'be69f0a800903b7573b18d9287d18b2f368b8b11':
  h264: move col_{parity,fieldoff} into the per-slice context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.h
libavcodec/h264_direct.c

Simple merge
Simple merge