← Back to branch summary

~ubuntu-branches/ubuntu/raring/gst-libav1.0/raring

« back to all changes in this revision

Viewing changes to gst-libs/ext/libav/libavcodec/flashsv.c

  • Committer: Package Import Robot
  • Author(s): Sebastian Dröge
  • Date: 2013-03-22 18:30:16 UTC
  • mfrom: (13.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20130322183016-j9g41he8zscizfsj
Tags: 1.0.6-1
New upstream bugfix release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/libav/libavcodec/flashsv.c
370
370
                }
371
371
 
372
372
                if (has_diff) {
 
373
                    if (!s->keyframe) {
 
374
                        av_log(avctx, AV_LOG_ERROR,
 
375
                               "inter frame without keyframe\n");
 
376
                        return AVERROR_INVALIDDATA;
 
377
                    }
373
378
                    s->diff_start  = get_bits(&gb, 8);
374
379
                    s->diff_height = get_bits(&gb, 8);
375
380
                    av_log(avctx, AV_LOG_DEBUG,
389
394
                    av_log_missing_feature(avctx, "zlibprime_curr", 1);
390
395
                    return AVERROR_PATCHWELCOME;
391
396
                }
 
397
                if (!s->blocks && (s->zlibprime_curr || s->zlibprime_prev)) {
 
398
                    av_log(avctx, AV_LOG_ERROR, "no data available for zlib "
 
399
                           "priming\n");
 
400
                    return AVERROR_INVALIDDATA;
 
401
                }
392
402
                size--; // account for flags byte
393
403
            }
394
404