← Back to branch summary

~bratsche/vlc/vlc-notify-add-actions-with-server-support

« back to all changes in this revision

Viewing changes to modules/codec/ffmpeg/video_filter.c

  • Committer: Bazaar Package Importer
  • Date: 2008-11-28 09:36:54 UTC
  • Revision ID: jamesw@ubuntu.com-20081128093654-cjcihcp06qc9v154
Tags: upstream-ubuntu-0.8.6.release.h
Import upstream version 0.8.6.release.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/codec/ffmpeg/video_filter.c
3
3
 *               using the ffmpeg library
4
4
 *****************************************************************************
5
5
 * Copyright (C) 1999-2001 the VideoLAN team
6
 
 * $Id: video_filter.c 25091 2008-02-10 22:36:49Z jpsaman $
 
6
 * $Id: a6d66457c73a31abbe49d51c6f0ef10b6a57234b $
7
7
 *
8
8
 * Authors: Gildas Bazin <gbazin@videolan.org>
9
9
 *
30
30
#include "vlc_filter.h"
31
31
 
32
32
/* ffmpeg header */
33
 
#ifdef HAVE_FFMPEG_AVCODEC_H
 
33
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
 
34
#   include <libavcodec/avcodec.h>
 
35
#elif defined(HAVE_FFMPEG_AVCODEC_H)
34
36
#   include <ffmpeg/avcodec.h>
35
37
#else
36
38
#   include <avcodec.h>
422
424
    if( !p_pic_dst )
423
425
    {
424
426
        msg_Warn( p_filter, "can't get output picture" );
425
 
        p_pic->pf_release( p_pic );
 
427
        if( p_pic->pf_release )
 
428
            p_pic->pf_release( p_pic );
426
429
        return NULL;
427
430
    }
428
431
 
598
601
    p_pic_dst->b_progressive = p_pic->b_progressive;
599
602
    p_pic_dst->b_top_field_first = p_pic->b_top_field_first;
600
603
 
601
 
    p_pic->pf_release( p_pic );
 
604
    if( p_pic->pf_release )
 
605
        p_pic->pf_release( p_pic );
602
606
    return p_pic_dst;
603
607
}
604
608
 
688
692
    p_pic_dst->b_progressive = VLC_TRUE;
689
693
    p_pic_dst->b_top_field_first = p_pic->b_top_field_first;
690
694
 
691
 
    p_pic->pf_release( p_pic );
 
695
    if( p_pic->pf_release )
 
696
        p_pic->pf_release( p_pic );
692
697
    return p_pic_dst;
693
698
}