On Sun, Jun 30, 2013 at 06:26:15PM +0200, Luca Barbato wrote:
> ---
> libavcodec/ivi_common.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
> index cdd4376..39e9f92 100644
> --- a/libavcodec/ivi_common.c
> +++ b/libavcodec/ivi_common.c
> @@ -85,7 +85,7 @@ static int ivi_create_huff_from_desc(const IVIHuffDesc *cb,
> VLC *vlc, int flag)
>
> bits[pos] = i + cb->xbits[i] + not_last_row;
> if (bits[pos] > IVI_VLC_BITS)
> - return -1; /* invalid descriptor */
> + return AVERROR_INVALIDDATA; /* invalid descriptor */
>
> codewords[pos] = inv_bits((prefix | j), bits[pos]);
> if (!bits[pos])
> @@ -486,7 +486,7 @@ static int ivi_decode_blocks(GetBitContext *gb,
> IVIBandDesc *band, IVITile *tile
> } else {
> if (sym >= 256U) {
> av_log(avctx, AV_LOG_ERROR, "Invalid sym
> encountered: %d.\n", sym);
> - return -1;
> + return AVERROR_INVALIDDATA;
> }
> run = rvmap->runtab[sym];
> val = rvmap->valtab[sym];
> @@ -509,7 +509,7 @@ static int ivi_decode_blocks(GetBitContext *gb,
> IVIBandDesc *band, IVITile *tile
> }// while
>
> if (scan_pos >= num_coeffs && sym != rvmap->eob_sym)
> - return -1; /* corrupt block data */
> + return AVERROR_INVALIDDATA; /* corrupt block data */
>
> /* undoing DC coeff prediction for intra-blocks */
> if (is_intra && band->is_2d_trans) {
> @@ -836,14 +836,14 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
> if (result) {
> av_log(avctx, AV_LOG_ERROR,
> "Error while decoding picture header: %d\n", result);
> - return -1;
> + return result;
> }
> if (ctx->gop_invalid)
> return AVERROR_INVALIDDATA;
>
> if (ctx->gop_flags & IVI5_IS_PROTECTED) {
> - av_log(avctx, AV_LOG_ERROR, "Password-protected clip!\n");
> - return -1;
> + avpriv_report_missing_feature(avctx, "Password-protected clip!\n");
> + return AVERROR_PATCHWELCOME;
> }
>
> ctx->switch_buffers(ctx);
> @@ -854,10 +854,10 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
> for (p = 0; p < 3; p++) {
> for (b = 0; b < ctx->planes[p].num_bands; b++) {
> result = decode_band(ctx, &ctx->planes[p].bands[b], avctx);
> - if (result) {
> + if (result < 0) {
> av_log(avctx, AV_LOG_ERROR,
> "Error while decoding band: %d, plane: %d\n", b,
> p);
> - return -1;
> + return result;
> }
> }
> }
> --
looks OK
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
