diff options
| author | Kieran Kunhya <kierank@ob-encoder.com> | 2015-12-09 00:05:35 +0000 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-12-10 21:39:06 +0000 |
| commit | 8880ca230738056c276fba78ab595ef877fbcc6f (patch) | |
| tree | d4db2a1ac9121fb155f75c4c8c161e29ae89e7b0 | |
| parent | 8eb6acef928d1d5f1a09e2ecb598ace2c99878f1 (diff) | |
| download | ffmpeg-8880ca230738056c276fba78ab595ef877fbcc6f.tar.gz | |
diracdec: Store version major/minor flags
| -rw-r--r-- | libavcodec/dirac.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index fd6e869194..7546bd5537 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -297,22 +297,21 @@ int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb, DiracVersionInfo *version, int *bit_depth) { - unsigned version_major; unsigned video_format, picture_coding_mode; int ret; /* [DIRAC_SPEC] 10.1 Parse Parameters. parse_parameters() */ - version_major = svq3_get_ue_golomb(gb); - svq3_get_ue_golomb(gb); /* version_minor */ - avctx->profile = svq3_get_ue_golomb(gb); - avctx->level = svq3_get_ue_golomb(gb); + version->major = svq3_get_ue_golomb(gb); + version->minor = svq3_get_ue_golomb(gb); + avctx->profile = svq3_get_ue_golomb(gb); + avctx->level = svq3_get_ue_golomb(gb); /* [DIRAC_SPEC] sequence_header() -> base_video_format as defined in * 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"); - else if (version_major > 2) + else if (version->major > 2) av_log(avctx, AV_LOG_WARNING, "Stream may have unhandled features\n"); if (video_format > 20U) |