diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 21:11:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 21:11:42 +0100 |
| commit | 9244a68092296f37aeb8048a1c9516c4eb527cd1 (patch) | |
| tree | 925c0a2f0c28e4c58eda5e88c9bebe5933d2c039 /libavcodec/h264.c | |
| parent | 074bae745d9d99d94ef99f870d0a6bb50d1e7a0b (diff) | |
| parent | 9eda9d3322a6ea91830a754f2edee222adae7e67 (diff) | |
| download | ffmpeg-9244a68092296f37aeb8048a1c9516c4eb527cd1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: free the tables and uninitialize the context on flush
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e8b3f64f28..a025d9fd0c 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2823,6 +2823,9 @@ static void flush_dpb(AVCodecContext *avctx) h->parse_context.overread_index = 0; h->parse_context.index = 0; h->parse_context.last_index = 0; + + free_tables(h, 1); + h->context_initialized = 0; } int ff_init_poc(H264Context *h, int pic_field_poc[2], int *pic_poc) |