From dd37b29ab043a2d3492a5520ccc3191431191557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96man?= <andreas@lonelycoder.com>
Date: Mon, 25 Feb 2008 09:40:52 +0000
Subject: [PATCH] ffmpeg include paths have changed

---
 avgen.c         | 2 --
 dvb.c           | 1 -
 dvb_fe.c        | 1 -
 dvb_tables.c    | 2 --
 ffmuxer.c       | 5 ++---
 file_input.c    | 3 +--
 http.c          | 2 +-
 main.c          | 3 +--
 parsers.c       | 1 -
 psi.c           | 2 +-
 pvr.c           | 4 +---
 pvr.h           | 2 +-
 rtp.c           | 3 ---
 rtsp.c          | 2 +-
 subscriptions.c | 2 --
 subscriptions.h | 2 --
 transports.c    | 2 --
 transports.h    | 2 +-
 tsdemux.c       | 2 --
 tvhead.h        | 2 +-
 v4l.c           | 2 --
 21 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/avgen.c b/avgen.c
index cb2fe7ec..98005d04 100644
--- a/avgen.c
+++ b/avgen.c
@@ -32,8 +32,6 @@
 #include <string.h>
 
 #include <inttypes.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
 
 #include <libhts/htscfg.h>
 
diff --git a/dvb.c b/dvb.c
index 9139bed2..810514f1 100644
--- a/dvb.c
+++ b/dvb.c
@@ -33,7 +33,6 @@
 #include <linux/dvb/dmx.h>
 
 #include <libhts/htscfg.h>
-#include <ffmpeg/avstring.h>
 
 #include "tvhead.h"
 #include "dispatch.h"
diff --git a/dvb_fe.c b/dvb_fe.c
index 7f1f0f18..01bc6eb4 100644
--- a/dvb_fe.c
+++ b/dvb_fe.c
@@ -33,7 +33,6 @@
 #include <linux/dvb/dmx.h>
 
 #include <libhts/htscfg.h>
-#include <ffmpeg/avstring.h>
 
 #include "tvhead.h"
 #include "dispatch.h"
diff --git a/dvb_tables.c b/dvb_tables.c
index 01a40e2f..383cd622 100644
--- a/dvb_tables.c
+++ b/dvb_tables.c
@@ -33,8 +33,6 @@
 #include <linux/dvb/dmx.h>
 
 #include <libhts/htscfg.h>
-#include <ffmpeg/avstring.h>
-
 #include "tvhead.h"
 #include "dispatch.h"
 #include "dvb.h"
diff --git a/ffmuxer.c b/ffmuxer.c
index ca873fc2..32e8dc88 100644
--- a/ffmuxer.c
+++ b/ffmuxer.c
@@ -30,9 +30,8 @@
 #include <errno.h>
 #include <dirent.h>
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avstring.h>
+#include <libavformat/avformat.h>
+#include <libavutil/avstring.h>
 
 #include <libhts/htscfg.h>
 
diff --git a/file_input.c b/file_input.c
index ce0f8053..e3f231d1 100644
--- a/file_input.c
+++ b/file_input.c
@@ -32,8 +32,6 @@
 #include <string.h>
 
 #include <inttypes.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
 
 #include <libhts/htscfg.h>
 
@@ -45,6 +43,7 @@
 #include "parsers.h"
 #include "buffer.h"
 
+#include <libavformat/avformat.h>
 
 typedef struct file_input {
   AVFormatContext *fi_fctx;
diff --git a/http.c b/http.c
index 1af8b714..d006453a 100644
--- a/http.c
+++ b/http.c
@@ -29,7 +29,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include <ffmpeg/base64.h>
+#include <libavutil/base64.h>
 
 #include "tvhead.h"
 #include "channels.h"
diff --git a/main.c b/main.c
index b6ca39a8..4e91a428 100644
--- a/main.c
+++ b/main.c
@@ -33,8 +33,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
 
 #include "tvhead.h"
 #include "dvb.h"
diff --git a/parsers.c b/parsers.c
index afa0aaad..0bc12835 100644
--- a/parsers.c
+++ b/parsers.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <ffmpeg/avcodec.h>
 #include <assert.h>
 
 #include "tvhead.h"
diff --git a/psi.c b/psi.c
index 203fe5ec..d41c91ed 100644
--- a/psi.c
+++ b/psi.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ffmpeg/common.h>
+#include <libavutil/common.h>
 
 #include "tvhead.h"
 #include "psi.h"
diff --git a/pvr.c b/pvr.c
index 122dd559..648e4772 100644
--- a/pvr.c
+++ b/pvr.c
@@ -30,9 +30,7 @@
 #include <errno.h>
 #include <dirent.h>
 
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avstring.h>
+#include <libavutil/avstring.h>
 
 #include <libhts/htscfg.h>
 
diff --git a/pvr.h b/pvr.h
index 1cb2b3d1..d3385001 100644
--- a/pvr.h
+++ b/pvr.h
@@ -19,7 +19,7 @@
 #ifndef PVR_H
 #define PVR_H
 
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
 
 extern char *pvrpath;
 extern struct pvr_rec_list pvrr_global_list;
diff --git a/rtp.c b/rtp.c
index 77e832a2..b374a3eb 100644
--- a/rtp.c
+++ b/rtp.c
@@ -34,9 +34,6 @@
 #include "rtp.h"
 #include "dispatch.h"
 
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/random.h>
-
 int
 rtp_sendmsg(uint8_t *pkt, int blocks, int64_t pcr,
 	    int fd, struct sockaddr *dst, socklen_t dstlen,
diff --git a/rtsp.c b/rtsp.c
index e8298521..64bd7def 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -42,7 +42,7 @@
 #include "tcp.h"
 #include "http.h"
 
-#include <ffmpeg/random.h>
+#include <libavutil/random.h>
 
 #include <libhts/htscfg.h>
 
diff --git a/subscriptions.c b/subscriptions.c
index fe558014..aa1ffd5a 100644
--- a/subscriptions.c
+++ b/subscriptions.c
@@ -36,8 +36,6 @@
 
 #include <libhts/htscfg.h>
 
-#include <ffmpeg/avcodec.h>
-
 #include "tvhead.h"
 #include "dispatch.h"
 #include "dvb_dvr.h"
diff --git a/subscriptions.h b/subscriptions.h
index d81efdfc..63ed55ba 100644
--- a/subscriptions.h
+++ b/subscriptions.h
@@ -19,8 +19,6 @@
 #ifndef SUBSCRIPTIONS_H
 #define SUBSCRIPTIONS_H
 
-#include <ffmpeg/avcodec.h>
-
 void subscription_unsubscribe(th_subscription_t *s);
 
 void subscription_set_weight(th_subscription_t *s, unsigned int weight);
diff --git a/transports.c b/transports.c
index af884590..19eeb847 100644
--- a/transports.c
+++ b/transports.c
@@ -36,8 +36,6 @@
 
 #include <libhts/htscfg.h>
 
-#include <ffmpeg/avcodec.h>
-
 #include "tvhead.h"
 #include "dispatch.h"
 #include "dvb_dvr.h"
diff --git a/transports.h b/transports.h
index 095a0390..3d3f4ea9 100644
--- a/transports.h
+++ b/transports.h
@@ -19,7 +19,7 @@
 #ifndef TRANSPORTS_H
 #define TRANSPORTS_H
 
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 
 unsigned int transport_compute_weight(struct th_transport_list *head);
 
diff --git a/tsdemux.c b/tsdemux.c
index e1e7267c..cfc04aaa 100644
--- a/tsdemux.c
+++ b/tsdemux.c
@@ -37,8 +37,6 @@
 
 #include <libhts/htscfg.h>
 
-#include <ffmpeg/avcodec.h>
-
 #include "tvhead.h"
 #include "dispatch.h"
 #include "teletext.h"
diff --git a/tvhead.h b/tvhead.h
index 894b18db..379d3d59 100644
--- a/tvhead.h
+++ b/tvhead.h
@@ -27,7 +27,7 @@
 #include <libhts/htscfg.h>
 #include <libhts/avg.h>
 #include "refstr.h"
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 
 /*
  * Commercial status
diff --git a/v4l.c b/v4l.c
index 317de825..0678aded 100644
--- a/v4l.c
+++ b/v4l.c
@@ -30,8 +30,6 @@
 #include <string.h>
 
 #include <inttypes.h>
-#include <ffmpeg/avio.h>
-#include <ffmpeg/avformat.h>
 
 #define __user
 #include <linux/videodev2.h>