mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-10-09 02:30:45 +08:00
Merge commit '1d12a545ce828eaf4fb37295400008ea37635ab8'
* commit '1d12a545ce828eaf4fb37295400008ea37635ab8':
cbs: Add an explicit type for coded bitstream unit types
Mostly already present from 6734eef6b8
, two
minor message changes are merged.
Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user