Merge commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:14:01 +0000 (14:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 13:14:05 +0000 (14:14 +0100)
* commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a':
  h264: move neighbor_transform_size into the per-slice context

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

Simple merge
Simple merge
Simple merge