aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-05-22 03:04:35 +0200
committerMark Thompson <sw@jkqxz.net>2019-05-29 00:16:26 +0100
commit1759a9e5b52de524fa9f3f4d115087132744176b (patch)
tree25fc84fe1745a0ec1a89184b6848f62dc493c7fe /libavcodec
parentde5880383967f44927c599ab16fa0f4f96b38365 (diff)
downloadffmpeg-1759a9e5b52de524fa9f3f4d115087132744176b.tar.gz
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@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/cbs_mpeg2.c4
-rw-r--r--libavcodec/cbs_mpeg2_syntax_template.c4
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, &current->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;
}
}