← Back to branch summary

~ubuntu-branches/debian/experimental/libav/experimental

« back to all changes in this revision

Viewing changes to libavcodec/dvdsubdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-08-17 22:33:40 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20140817223340-net3rzywma60pzhz
Tags: 6:11~beta1-1
http://bugs.debian.org/758447
* New upstream Release v11~alpha2
* build against libgnutls28-dev (Closes: #758447)
* Bump shlibs

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/dvdsubdec.c
314
314
            if (h < 0)
315
315
                h = 0;
316
316
            if (w > 0 && h > 0) {
317
 
                if (sub_header->rects != NULL) {
 
317
                if (sub_header->rects) {
318
318
                    for (i = 0; i < sub_header->num_rects; i++) {
319
319
                        av_freep(&sub_header->rects[i]->pict.data[0]);
320
320
                        av_freep(&sub_header->rects[i]->pict.data[1]);
360
360
    if (sub_header->num_rects > 0)
361
361
        return is_menu;
362
362
 fail:
363
 
    if (sub_header->rects != NULL) {
 
363
    if (!sub_header->rects) {
364
364
        for (i = 0; i < sub_header->num_rects; i++) {
365
365
            av_freep(&sub_header->rects[i]->pict.data[0]);
366
366
            av_freep(&sub_header->rects[i]->pict.data[1]);
391
391
    int y1, y2, x1, x2, y, w, h, i;
392
392
    uint8_t *bitmap;
393
393
 
394
 
    if (s->num_rects == 0 || s->rects == NULL || s->rects[0]->w <= 0 || s->rects[0]->h <= 0)
 
394
    if (s->num_rects == 0 || !s->rects || s->rects[0]->w <= 0 || s->rects[0]->h <= 0)
395
395
        return 0;
396
396
 
397
397
    for(i = 0; i < s->rects[0]->nb_colors; i++) {