[FFmpeg-devel] [PATCH 4/4] cbs_mpeg2: Correct error codes
Andreas Rheinhardt
andreas.rheinhardt at gmail.com
Sun Apr 21 17:04:04 EEST 2019
Up until now, things that are merely unsupported by cbs_mpeg2 have been
declared to be invalid input. This has been changed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
---
libavcodec/cbs_mpeg2.c | 4 +---
libavcodec/cbs_mpeg2_syntax_template.c | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index 954adc7d57..013358d5e4 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -233,9 +233,7 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx,
START(MPEG2_START_GROUP, MPEG2RawGroupOfPicturesHeader, group_of_pictures_header, NULL);
#undef START
default:
- av_log(ctx->log_ctx, AV_LOG_ERROR, "Unknown start code %02"PRIx32".\n",
- unit->type);
- return AVERROR_INVALIDDATA;
+ return AVERROR(ENOSYS);
}
}
diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c
index 7b3f225396..1d31875d77 100644
--- a/libavcodec/cbs_mpeg2_syntax_template.c
+++ b/libavcodec/cbs_mpeg2_syntax_template.c
@@ -323,9 +323,9 @@ static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw,
return FUNC(picture_coding_extension)
(ctx, rw, ¤t->data.picture_coding);
default:
- av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid extension ID %d.\n",
+ av_log(ctx->log_ctx, AV_LOG_ERROR, "Extension ID %d not supported.\n",
current->extension_start_code_identifier);
- return AVERROR_INVALIDDATA;
+ return AVERROR_PATCHWELCOME;
}
}
--
2.21.0
More information about the ffmpeg-devel
mailing list