← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ffmpeg-debian/trusty

« back to all changes in this revision

Viewing changes to libavcodec/indeo3.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-02-05 21:22:01 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090205212201-hjhtybuxtm90cbjy
Tags: 3:0.svn20090204-2ubuntu1
* merge from debian. Remaining changes:
  - don't build depend on libfaad-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/indeo3.c
252
252
 
253
253
        if(cmd == 0) {
254
254
            strip++;
 
255
            if(strip >= strip_tbl + FF_ARRAY_ELEMS(strip_tbl)) {
 
256
                av_log(s->avctx, AV_LOG_WARNING, "out of range strip\n");
 
257
                break;
 
258
            }
255
259
            memcpy(strip, strip-1, sizeof(*strip));
256
260
            strip->split_flag = 1;
257
261
            strip->split_direction = 0;
259
263
            continue;
260
264
        } else if(cmd == 1) {
261
265
            strip++;
 
266
            if(strip >= strip_tbl + FF_ARRAY_ELEMS(strip_tbl)) {
 
267
                av_log(s->avctx, AV_LOG_WARNING, "out of range strip\n");
 
268
                break;
 
269
            }
262
270
            memcpy(strip, strip-1, sizeof(*strip));
263
271
            strip->split_flag = 1;
264
272
            strip->split_direction = 1;
929
937
            }
930
938
        }
931
939
 
932
 
        if(strip < strip_tbl)
933
 
            return;
934
 
 
935
940
        for( ; strip >= strip_tbl; strip--) {
936
941
            if(strip->split_flag != 0) {
937
942
                strip->split_flag = 0;