Merge commit '7747726667c86877feed30c9e18460cb8e63f551'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:46:20 +0000 (14:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:46:23 +0000 (14:46 +0100)
* commit '7747726667c86877feed30c9e18460cb8e63f551':
  h264: move map_col_to_list0[_field] 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