← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/blender/imbuf/intern/IMB_anim.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/imbuf/intern/IMB_anim.h
1
1
/**
2
2
 * allocimbuf.h
3
3
 *
4
 
 * $Id: IMB_anim.h 15384 2008-06-29 15:11:35Z schlaile $
 
4
 * $Id: IMB_anim.h 19359 2009-03-22 19:19:21Z schlaile $
5
5
 *
6
6
 * ***** BEGIN GPL LICENSE BLOCK *****
7
7
 *
76
76
#endif /* WITH_QUICKTIME */
77
77
 
78
78
#ifdef WITH_FFMPEG
79
 
#include <ffmpeg/avformat.h>
80
 
#include <ffmpeg/avcodec.h>
81
 
#include <ffmpeg/swscale.h>
 
79
#include <libavformat/avformat.h>
 
80
#include <libavcodec/avcodec.h>
 
81
#include <libswscale/swscale.h>
82
82
#endif
83
83
 
84
84
#ifdef WITH_REDCODE
85
 
#include <redcode/format.h>
 
85
#ifdef _WIN32 /* on windows we use the one in extern instead */
 
86
#include "libredcode/format.h"
 
87
#else
 
88
#include "libredcode/format.h"
 
89
#endif
86
90
#endif
87
91
 
88
92
#include "IMB_imbuf_types.h"