Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:25:31 +0000 (15:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 14:27:29 +0000 (15:27 +0100)
commit35a788d953838c1b7f34038ef54fddc3d11994fe
treecf8179e051dbf1881f591317f4146a2edbd738dc
parentcc2cfdc49786a8268d1514661c17ea96035d6f1d
parentb063582e0c4f775a8ba377488bd085595e0e7fae
Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'

* commit 'b063582e0c4f775a8ba377488bd085595e0e7fae':
  h264: move intra_pcm_ptr into the per-slice context

Conflicts:
libavcodec/h264.h

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