Revert "Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'""
authorTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 00:45:36 +0000 (17:45 -0700)
committerTimothy Gu <timothygu99@gmail.com>
Thu, 4 Aug 2016 00:45:52 +0000 (17:45 -0700)
commit826c780c1209a8bd7e98ad2c532cbee86401e746
tree3f4bfbc1d84c8f3bab88a128ca57dc5adf822e7c
parente4af9be0f45c8f2ca148fb971f1e0c6782530e8c
Revert "Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'""

This reverts commit e4af9be0f45c8f2ca148fb971f1e0c6782530e8c and redoes
796027f22154c799e0063e2457b31e0cfd1dddae.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/h264_slice.c
libavcodec/h264dec.c
libavcodec/h264dec.h