Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 08:21:04 +0000 (10:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 08:25:17 +0000 (10:25 +0200)
commit4a89868c5f9de30bb2eb3709befa33b8440264ec
treef7276b945dd83998846e6ad2d71d15a06bd38e21
parentb0b66269f422a5c19547102c7d51504505060cc0
parentcab8c5f8e140c96ba3725ab709d823abfd1e31a5
Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'

* commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5':
  h264: do not reinitialize the global cabac tables at each slice header

See: 1e2e2c8095de2d9ea3259305cfeff28f40e4ca12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cabac.c
libavcodec/h264.c