[FFmpeg-cvslog] cbs_mpeg2: Correct error codes
Andreas Rheinhardt
git at videolan.org
Wed May 29 02:36:40 EEST 2019
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Wed May 22 03:04:35 2019 +0200| [1759a9e5b52de524fa9f3f4d115087132744176b] | committer: Mark Thompson
cbs_mpeg2: Correct error codes
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>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1759a9e5b52de524fa9f3f4d115087132744176b
---
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 1f1197fb30..ce22e32c15 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -251,9 +251,7 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx,
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 09487fe56d..d753cdc901 100644
--- a/libavcodec/cbs_mpeg2_syntax_template.c
+++ b/libavcodec/cbs_mpeg2_syntax_template.c
@@ -335,9 +335,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;
}
}
More information about the ffmpeg-cvslog
mailing list