[SCM] openmovieeditor/master: Drop 04_ffmpeg_headers.dpatch, no longer needed.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4b3a8221b926f42f18f8b462bbae42489fb7f263
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 15 23:54:40 2010 +0100

    Drop 04_ffmpeg_headers.dpatch, no longer needed.

diff --git a/debian/patches/04_ffmpeg_headers.dpatch b/debian/patches/04_ffmpeg_headers.dpatch
deleted file mode 100755
index 46e86aa..0000000
--- a/debian/patches/04_ffmpeg_headers.dpatch
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_ffmpeg_headers.dpatch by Fabrice Coutadeur
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix location of ffmpeg headers
-
- at DPATCH@
-diff -urNad openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.H openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.H
---- openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.H	2007-05-31 15:29:52.000000000 -0400
-+++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.H	2009-03-09 14:45:10.000000000 -0400
-@@ -24,8 +24,8 @@
- #ifdef AVCODEC
- 
- extern "C" {
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- }
- 
- #include "global_includes.H"
-diff -urNad openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.cxx openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.cxx
---- openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.cxx	2007-10-18 05:53:59.000000000 -0400
-+++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.cxx	2009-03-09 14:45:55.000000000 -0400
-@@ -132,7 +132,7 @@
- 			uint8_t *ptr = m_packet.data;
- 			int data_size;
- 			while ( ptr != NULL && ret >= 0 && m_packet.stream_index == m_audioStream && len > 0 ) {
--				ret = avcodec_decode_audio( m_codecContext, m_tmpBuffer, &data_size, ptr, len );
-+				ret = avcodec_decode_audio2( m_codecContext, m_tmpBuffer, &data_size, ptr, len );
- 				if ( ret < 0 ) {
- 					ret = 0;
- 					break;
-diff -urNad openmovieeditor-0.0.20080102~/src/VideoFileFfmpeg.H openmovieeditor-0.0.20080102/src/VideoFileFfmpeg.H
---- openmovieeditor-0.0.20080102~/src/VideoFileFfmpeg.H	2007-09-14 07:51:56.000000000 -0400
-+++ openmovieeditor-0.0.20080102/src/VideoFileFfmpeg.H	2009-03-09 14:44:21.000000000 -0400
-@@ -23,10 +23,10 @@
- #ifdef AVCODEC
- 
- extern "C" {
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- #ifdef SWSCALE
--	#include <ffmpeg/swscale.h>
-+	#include <libswscale/swscale.h>
- #endif /* SWSCALE */
- }
- 
-diff -urNad openmovieeditor-0.0.20080102~/src/nle_main.cxx openmovieeditor-0.0.20080102/src/nle_main.cxx
---- openmovieeditor-0.0.20080102~/src/nle_main.cxx	2007-12-23 10:20:05.000000000 -0500
-+++ openmovieeditor-0.0.20080102/src/nle_main.cxx	2009-03-09 14:43:24.000000000 -0400
-@@ -31,7 +31,7 @@
- 
- #ifdef AVCODEC
- extern "C" {
--  #include <ffmpeg/avformat.h>
-+  #include <libavformat/avformat.h>
- }
- #endif
- 

-- 
openmovieeditor packaging