Commit 50b7ce12 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7a82022e'

* commit '7a82022e':
  h264_parser: Initialize the h264dsp context in the parser as well
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 69ea65b4 7a82022e
...@@ -466,6 +466,7 @@ static av_cold int init(AVCodecParserContext *s) ...@@ -466,6 +466,7 @@ static av_cold int init(AVCodecParserContext *s)
H264Context *h = s->priv_data; H264Context *h = s->priv_data;
h->thread_context[0] = h; h->thread_context[0] = h;
h->slice_context_count = 1; h->slice_context_count = 1;
ff_h264dsp_init(&h->h264dsp, 8, 1);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment