[libav-devel] [PATCH] adtsenc: make use of AVERROR macros instead of -1 when returning an error.

[Patrice Clement]

---
 libavformat/adtsenc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index e7c9ca6..6ed9ddb 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -57,23 +57,23 @@ static int adts_decode_extradata(AVFormatContext *s, 
ADTSContext *adts, uint8_t
 
     if (adts->objecttype > 3U) {
         av_log(s, AV_LOG_ERROR, "MPEG-4 AOT %d is not allowed in ADTS\n", 
adts->objecttype+1);
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
     if (adts->sample_rate_index == 15) {
         av_log(s, AV_LOG_ERROR, "Escape sample rate index illegal in ADTS\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
     if (get_bits(&gb, 1)) {
         av_log(s, AV_LOG_ERROR, "960/120 MDCT window is not allowed in 
ADTS\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
     if (get_bits(&gb, 1)) {
         av_log(s, AV_LOG_ERROR, "Scalable configurations are not allowed in 
ADTS\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
     if (get_bits(&gb, 1)) {
         av_log(s, AV_LOG_ERROR, "Extension flag is not allowed in ADTS\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
     if (!adts->channel_conf) {
         init_put_bits(&pb, adts->pce_data, MAX_PCE_SIZE);
@@ -95,7 +95,7 @@ static int adts_write_header(AVFormatContext *s)
 
     if (avc->extradata_size > 0 &&
             adts_decode_extradata(s, adts, avc->extradata, 
avc->extradata_size) < 0)
-        return -1;
+        return AVERROR_INVALIDDATA;
 
     return 0;
 }
-- 
1.8.3.2

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel