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)
commit27b3522ba3cf539e13bb0f8f9c68d2dd513a8f73
treefe68b8003a082290424d372b37debb1ef7fcd5cc
parentbd76a4822f989f30c6dc109a5157d6239a6b1112
parent7747726667c86877feed30c9e18460cb8e63f551
Merge commit '7747726667c86877feed30c9e18460cb8e63f551'

* commit '7747726667c86877feed30c9e18460cb8e63f551':
  h264: move map_col_to_list0[_field] into the per-slice context

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