Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:58:11 +0000 (13:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:59:16 +0000 (13:59 +0100)
commit6ec279b54c09f47208930021a38a742f2cc09324
treec02bfae014bb7a1a3e1706ea8b82d0cc85d2eca0
parent20f5be1038fcf9f88d5c74c16c01dd21584405b3
parent64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e
Merge commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e'

* commit '64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e':
  h264: move *_samples_available into the per-slice context

Conflicts:
libavcodec/h264.c
libavcodec/h264_mb.c

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