Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'

* commit '6689474b91049411b5b7986616d1c66b701ae11f':
  v210x: return meaningful error codes.
  r210dec: return meaningful error codes.
  vb: cosmetics, reformat

Conflicts:
	libavcodec/vb.c

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

1 files changed, 5 insertions, 4 deletions

diff --git a/libavcodec/v210x.c b/libavcodec/v210x.c
index f973124122..aa0da7f756 100644
--- a/libavcodec/v210x.c
+++ b/libavcodec/v210x.c
@@ -28,7 +28,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 {
     if(avctx->width & 1){
         av_log(avctx, AV_LOG_ERROR, "v210x needs even width\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
     avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
     avctx->bits_per_raw_sample= 10;
@@ -48,13 +48,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     AVFrame *pic= avctx->coded_frame;
     const uint32_t *src= (const uint32_t *)avpkt->data;
     uint16_t *ydst, *udst, *vdst, *yend;
+    int ret;
 
     if(pic->data[0])
         avctx->release_buffer(avctx, pic);
 
     if(avpkt->size < avctx->width * avctx->height * 8 / 3){
         av_log(avctx, AV_LOG_ERROR, "Packet too small\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
     if(avpkt->size > avctx->width * avctx->height * 8 / 3){
@@ -62,8 +63,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     }
 
     pic->reference= 0;
-    if(ff_get_buffer(avctx, pic) < 0)
-        return -1;
+    if ((ret = ff_get_buffer(avctx, pic)) < 0)
+        return ret;
 
     ydst= (uint16_t *)pic->data[0];
     udst= (uint16_t *)pic->data[1];