virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa'

Browse Source 
* commit '7693ba0a0eecdcdba71b7fbd9a4a12d1ba7b82aa':
  hevc: export stream parameters from extradata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-04-03 21:29:50 +02:00
parent a7a6194ec4 7693ba0a0e
commit d386a523ae
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/hevc.c
View File

@@ -3375,7 +3375,7 @@ static int hevc_decode_extradata(HEVCContext *s)
{ {
AVCodecContext *avctx = s->avctx; AVCodecContext *avctx = s->avctx;
GetByteContext gb; GetByteContext gb;
int ret; int ret, i;
bytestream2_init(&gb, avctx->extradata, avctx->extradata_size); bytestream2_init(&gb, avctx->extradata, avctx->extradata_size);
@@ -3432,6 +3432,16 @@ static int hevc_decode_extradata(HEVCContext *s)
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
/* export stream parameters from the first SPS */
for (i = 0; i < FF_ARRAY_ELEMS(s->sps_list); i++) {
if (s->sps_list[i]) {
const HEVCSPS *sps = (const HEVCSPS*)s->sps_list[i]->data;
export_stream_params(s->avctx, s, sps);
break;
}
}
return 0; return 0;
} }