[FFmpeg-devel,05/11] cbs_mpeg2: Correct error codes

Submitted by Andreas Rheinhardt on May 22, 2019, 1:04 a.m.

Details

Message ID 20190522010441.44257-6-andreas.rheinhardt@gmail.com
State New
Headers show

Commit Message

Andreas Rheinhardt May 22, 2019, 1:04 a.m.
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>
---
 libavcodec/cbs_mpeg2.c                 | 4 +---
 libavcodec/cbs_mpeg2_syntax_template.c | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c
index de0ad8a043..4f89435c9d 100644
--- a/libavcodec/cbs_mpeg2.c
+++ b/libavcodec/cbs_mpeg2.c
@@ -266,9 +266,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 e34fa9495f..aa2544bc8a 100644
--- a/libavcodec/cbs_mpeg2_syntax_template.c
+++ b/libavcodec/cbs_mpeg2_syntax_template.c
@@ -339,9 +339,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;
     }
 }