[libav-devel] [PATCH 2/4] flvenc: cleanup return values

[Luca Barbato]

Return consistently AVERROR_INVALIDDATA on invalid input.
---
 libavformat/flvenc.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index c07cad2..8f06f1f 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -197,7 +197,7 @@ static int flv_write_header(AVFormatContext *s)
             video_enc = enc;
             if(enc->codec_tag == 0) {
                 av_log(s, AV_LOG_ERROR, "video codec not compatible with 
flv\n");
-                return -1;
+                return AVERROR_INVALIDDATA;
             }
         break;
         case AVMEDIA_TYPE_AUDIO:
@@ -214,7 +214,7 @@ static int flv_write_header(AVFormatContext *s)
         break;
         default:
             av_log(s, AV_LOG_ERROR, "codec not compatible with flv\n");
-            return -1;
+            return AVERROR_INVALIDDATA;
         }
         avpriv_set_pts_info(s->streams[i], 32, 1, 1000); /* 32 bit pts in ms */
 
@@ -425,7 +425,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket 
*pkt)
         flags = enc->codec_tag;
         if(flags == 0) {
             av_log(s, AV_LOG_ERROR, "video codec %X not compatible with 
flv\n",enc->codec_id);
-            return -1;
+            return AVERROR_INVALIDDATA;
         }
 
         flags |= pkt->flags & AV_PKT_FLAG_KEY ? FLV_FRAME_KEY : 
FLV_FRAME_INTER;
@@ -442,14 +442,14 @@ static int flv_write_packet(AVFormatContext *s, AVPacket 
*pkt)
         avio_w8(pb, FLV_TAG_TYPE_META);
     break;
     default:
-        return AVERROR(EINVAL);
+        return AVERROR_INVALIDDATA;
     break;
     }
     if (enc->codec_id == CODEC_ID_H264) {
         /* check if extradata looks like MP4 */
         if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {
             if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0)
-                return -1;
+                return AVERROR_INVALIDDATA;
         }
     }
     if (flv->delay == AV_NOPTS_VALUE)
@@ -457,7 +457,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket 
*pkt)
     if (pkt->dts < -flv->delay) {
         av_log(s, AV_LOG_WARNING, "Packets are not in the proper order with "
                                   "respect to DTS\n");
-        return AVERROR(EINVAL);
+        return AVERROR_INVALIDDATA;
     }
 
     ts = pkt->dts + flv->delay; // add delay to force positive dts
-- 
1.7.8.rc1

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