diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 12:21:04 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 12:25:17 +0400 |
| commit | 4a89868c5f9de30bb2eb3709befa33b8440264ec (patch) | |
| tree | f7276b945dd83998846e6ad2d71d15a06bd38e21 /libavcodec/h264.c | |
| parent | b0b66269f422a5c19547102c7d51504505060cc0 (diff) | |
| parent | cab8c5f8e140c96ba3725ab709d823abfd1e31a5 (diff) | |
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>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 4af37eb470..51484edce1 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1593,6 +1593,8 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) ff_h264_decode_init_vlc(); + ff_init_cabac_states(); + h->pixel_shift = 0; h->sps.bit_depth_luma = avctx->bits_per_raw_sample = 8; @@ -1629,7 +1631,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) h->low_delay = 0; } - ff_init_cabac_states(); avctx->internal->allocate_progress = 1; return 0; |