Merge commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:54:48 +0000 (16:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:54:48 +0000 (16:54 +0100)
commit72bec029ee18aada1c54101f4fa0aa991355321c
tree47268273f5e21e270ba5614ae22ae141f2bca724
parentd76559fb5f529db5f14d304936cadebce902b68c
parent7bbc254d646ed9cf6deffc3fda75ae6729f95979
Merge commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979'

* commit '7bbc254d646ed9cf6deffc3fda75ae6729f95979':
  h264: move resync_mb_{x,y} into the per-slice context

Conflicts:
libavcodec/h264_slice.c

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