Merge commit '47a0d393504d6726c4a235951153bee0abb3f7d6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:09:14 +0000 (16:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:09:14 +0000 (16:09 +0100)
commit70eec8f432dcee5b9867ba01a26436a04a9a0423
treec8880981559e31c14696486f7b300ed5c9cf0076
parentda7f4c32ab6bf517d4ef51297da46cf459479b22
parent47a0d393504d6726c4a235951153bee0abb3f7d6
Merge commit '47a0d393504d6726c4a235951153bee0abb3f7d6'

* commit '47a0d393504d6726c4a235951153bee0abb3f7d6':
  h264: move mb_skip_run into the per-slice context

Conflicts:
libavcodec/h264_cavlc.c

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