[FFmpeg-cvslog] diracdec: Store version major/minor flags
Kieran Kunhya
git at videolan.org
Thu Dec 10 22:40:08 CET 2015
ffmpeg | branch: master | Kieran Kunhya <kierank at ob-encoder.com> | Wed Dec 9 00:05:35 2015 +0000| [8880ca230738056c276fba78ab595ef877fbcc6f] | committer: Rostislav Pehlivanov
diracdec: Store version major/minor flags
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8880ca230738056c276fba78ab595ef877fbcc6f
---
libavcodec/dirac.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c
index fd6e869..7546bd5 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)
More information about the ffmpeg-cvslog
mailing list