avcodec/h264: Be more tolerant to changing pps id between slices
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Apr 2015 11:50:07 +0000 (13:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 Apr 2015 20:01:46 +0000 (22:01 +0200)
commite6d9094fd3c608e2c2f38ae368dc79fa0eda5d6f
tree7eb9fd7b2a91147a376a5460acb9180e18e6d9c1
parentbcc4c360aadff39907b185f9de88fdf9ac91e7cf
avcodec/h264: Be more tolerant to changing pps id between slices

Fixes Ticket4446

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 98d0c4236c7542c87f012228d3bc88aea67bddc2)

Conflicts:

libavcodec/h264.c
libavcodec/h264.c