har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '1d12a545ce828eaf4fb37295400008ea37635ab8'

Browse Source 
* commit '1d12a545ce828eaf4fb37295400008ea37635ab8':
  cbs: Add an explicit type for coded bitstream unit types

Mostly already present from 6734eef6b8b464139fdc140ec9bc9e8d74173869, two
minor message changes are merged.

Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Mark Thompson 2018-02-21 21:25:48 +00:00
commit cacb47633c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/cbs_mpeg2.c
View File

@ -220,7 +220,7 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx,
START(0xb8, MPEG2RawGroupOfPicturesHeader, group_of_pictures_header); START(0xb8, MPEG2RawGroupOfPicturesHeader, group_of_pictures_header);
#undef START #undef START
default: default:
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unknown start code %"PRIx32".\n", av_log(ctx->log_ctx, AV_LOG_ERROR, "Unknown start code %02"PRIx32".\n",
unit->type); unit->type);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -248,7 +248,7 @@ static int cbs_mpeg2_write_header(CodedBitstreamContext *ctx,
#undef START #undef START
default: default:
av_log(ctx->log_ctx, AV_LOG_ERROR, "Write unimplemented for start " av_log(ctx->log_ctx, AV_LOG_ERROR, "Write unimplemented for start "
"code %02"PRIu32".\n", unit->type); "code %02"PRIx32".\n", unit->type);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }