diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:42:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:43:46 +0100 |
| commit | a01fe55077d9627519930ad3e18d79a6682f6132 (patch) | |
| tree | c2b205aa14d0c7e32bb73d5fa6ca3f1511d1680f /libavcodec | |
| parent | 2f265d9087362c17920e4bce59b21653f3fffbfe (diff) | |
| parent | c0dc57f1264dad1e121772d03abdb9e14ed8857f (diff) | |
| download | ffmpeg-a01fe55077d9627519930ad3e18d79a6682f6132.tar.gz | |
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
asyncts: merge two conditions
x86inc: fully concatenate tokens to fix macro expansion for nasm
h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 85e10afac8..1fd1f38d58 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1169,6 +1169,8 @@ static int decode_init_thread_copy(AVCodecContext *avctx) memset(h->sps_buffers, 0, sizeof(h->sps_buffers)); memset(h->pps_buffers, 0, sizeof(h->pps_buffers)); + h->s.context_initialized = 0; + return 0; } |