diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 16:30:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 16:31:10 +0200 |
| commit | d13fc982470f5fe89b92ebbb93a101fb2b9e851e (patch) | |
| tree | dedc33ce4fb9bd432d785433875fba1cec46197a | |
| parent | 39bbdebb1ed8eb9c9b0cd6db85afde6ba89d86e4 (diff) | |
| parent | 18156b53f9b642b71c182c5c9818175a61572d2b (diff) | |
| download | ffmpeg-d13fc982470f5fe89b92ebbb93a101fb2b9e851e.tar.gz | |
Merge commit '18156b53f9b642b71c182c5c9818175a61572d2b'
* commit '18156b53f9b642b71c182c5c9818175a61572d2b':
hevc: do not pass an entire HEVCContext into export_stream_params()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/hevc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index fa5a505189..33c718d67e 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -280,10 +280,10 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb) return 0; } -static void export_stream_params(AVCodecContext *avctx, - const HEVCContext *s, const HEVCSPS *sps) +static void export_stream_params(AVCodecContext *avctx, const HEVCParamSets *ps, + const HEVCSPS *sps) { - const HEVCVPS *vps = (const HEVCVPS*)s->ps.vps_list[sps->vps_id]->data; + const HEVCVPS *vps = (const HEVCVPS*)ps->vps_list[sps->vps_id]->data; unsigned int num = 0, den = 0; avctx->pix_fmt = sps->pix_fmt; @@ -332,7 +332,7 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; int ret, i; - export_stream_params(s->avctx, s, sps); + export_stream_params(s->avctx, &s->ps, sps); pic_arrays_free(s); ret = pic_arrays_init(s, sps); @@ -3204,7 +3204,7 @@ static int hevc_decode_extradata(HEVCContext *s) for (i = 0; i < FF_ARRAY_ELEMS(s->ps.sps_list); i++) { if (s->ps.sps_list[i]) { const HEVCSPS *sps = (const HEVCSPS*)s->ps.sps_list[i]->data; - export_stream_params(s->avctx, s, sps); + export_stream_params(s->avctx, &s->ps, sps); break; } } |