RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 21:42:09 +00:00
Code Issues Projects Releases Wiki Activity

diracdec: Store version major/minor flags

Browse Source
This commit is contained in:
Kieran Kunhya 2015-12-09 00:05:35 +00:00 committed by Rostislav Pehlivanov
parent 8eb6acef92
commit 8880ca2307
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/dirac.c
View File

@ -297,22 +297,21 @@ int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
DiracVersionInfo *version, DiracVersionInfo *version,
int *bit_depth) int *bit_depth)
{ {
unsigned version_major;
unsigned video_format, picture_coding_mode; unsigned video_format, picture_coding_mode;
int ret; int ret;
/* [DIRAC_SPEC] 10.1 Parse Parameters. parse_parameters() */ /* [DIRAC_SPEC] 10.1 Parse Parameters. parse_parameters() */
version_major = svq3_get_ue_golomb(gb); version->major = svq3_get_ue_golomb(gb);
svq3_get_ue_golomb(gb); /* version_minor */ version->minor = svq3_get_ue_golomb(gb);
avctx->profile = svq3_get_ue_golomb(gb); avctx->profile = svq3_get_ue_golomb(gb);
avctx->level = svq3_get_ue_golomb(gb); avctx->level = svq3_get_ue_golomb(gb);
/* [DIRAC_SPEC] sequence_header() -> base_video_format as defined in /* [DIRAC_SPEC] sequence_header() -> base_video_format as defined in
* 10.2 Base Video Format, table 10.1 Dirac predefined video formats */ * 10.2 Base Video Format, table 10.1 Dirac predefined video formats */
video_format = svq3_get_ue_golomb(gb); video_format = svq3_get_ue_golomb(gb);
if (version_major < 2) if (version->major < 2)
av_log(avctx, AV_LOG_WARNING, "Stream is old and may not work\n"); av_log(avctx, AV_LOG_WARNING, "Stream is old and may not work\n");
else if (version_major > 2) else if (version->major > 2)
av_log(avctx, AV_LOG_WARNING, "Stream may have unhandled features\n"); av_log(avctx, AV_LOG_WARNING, "Stream may have unhandled features\n");
if (video_format > 20U) if (video_format > 20U)