Changeset 4177f501 in ffmpeg

Timestamp:

Feb 14, 2015, 7:29:34 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

088dfd3f

Parents:

3eec775b (diff), 7769be59 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'

• commit '7769be590c7aeb2aad26ca723d105cf5203e33d2': vp56: Return meaningful error codes

Conflicts:

libavcodec/vp56.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

File:

• libavcodec/vp56.c (modified) (5 diffs)

libavcodec/vp56.c

@@ -474 +474 @@
         ff_set_dimensions(avctx, 0, 0);
         av_log(avctx, AV_LOG_ERROR, "picture too big\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
@@ -510 +510 @@
     if (s->has_alpha) {
         if (remaining_buf_size < 3)
-            return -1;
+            return AVERROR_INVALIDDATA;
         alpha_offset = bytestream_get_be24(&buf);
         remaining_buf_size -= 3;
         if (remaining_buf_size < alpha_offset)
-            return -1;
+            return AVERROR_INVALIDDATA;
     }
 
@@ -529 +529 @@
     }
 
-    if (ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF) < 0)
-        return -1;
+    ret = ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF);
+    if (ret < 0)
+        return ret;
 
     if (avctx->pix_fmt == AV_PIX_FMT_YUVA420P) {
@@ -543 +544 @@
         if (vp56_size_changed(s)) {
             av_frame_unref(p);
-            return -1;
+            return AVERROR_INVALIDDATA;
         }
     }
@@ -565 +566 @@
             }
             av_frame_unref(p);
-            return -1;
+            return AVERROR_INVALIDDATA;
         }
     }