Changeset 4177f501 in ffmpeg


Ignore:
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'

Conflicts:

libavcodec/vp56.c

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libavcodec/vp56.c

    r3eec775b r4177f501  
    474474        ff_set_dimensions(avctx, 0, 0);
    475475        av_log(avctx, AV_LOG_ERROR, "picture too big\n");
    476         return -1;
     476        return AVERROR_INVALIDDATA;
    477477    }
    478478
     
    510510    if (s->has_alpha) {
    511511        if (remaining_buf_size < 3)
    512             return -1;
     512            return AVERROR_INVALIDDATA;
    513513        alpha_offset = bytestream_get_be24(&buf);
    514514        remaining_buf_size -= 3;
    515515        if (remaining_buf_size < alpha_offset)
    516             return -1;
     516            return AVERROR_INVALIDDATA;
    517517    }
    518518
     
    529529    }
    530530
    531     if (ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF) < 0)
    532         return -1;
     531    ret = ff_get_buffer(avctx, p, AV_GET_BUFFER_FLAG_REF);
     532    if (ret < 0)
     533        return ret;
    533534
    534535    if (avctx->pix_fmt == AV_PIX_FMT_YUVA420P) {
     
    543544        if (vp56_size_changed(s)) {
    544545            av_frame_unref(p);
    545             return -1;
     546            return AVERROR_INVALIDDATA;
    546547        }
    547548    }
     
    565566            }
    566567            av_frame_unref(p);
    567             return -1;
     568            return AVERROR_INVALIDDATA;
    568569        }
    569570    }
Note: See TracChangeset for help on using the changeset viewer.