Omkizing streamer without Aquosa support

diff --git a/Makefile.omk b/Makefile.omk
index 35be7ae4c18fb4efdaf9a1e4fb457e79fec81337..fa8978adc36f5c8b855bf713a9fd35cec13c1213 100644 (file)
--- a/Makefile.omk
+++ b/Makefile.omk
@@ -1,17 +1,10 @@
-#FFSRC ?= $(FFDIR)
-#CPPFLAGS= -I $(FFSRC)
 CFLAGS = -Wall
 CFLAGS += -Wdeclaration-after-statement
 CFLAGS += -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls
 CFLAGS += -Wno-pointer-sign 
-CFLAGS += -I /usr/include/ffmpeg
-#LDFLAGS= -L $(FFDIR)/libavutil -L $(FFDIR)/libavcodec -L $(FFDIR)/libavformat -L $(FFDIR)/libavdevice
-#LDLIBS = -lavdevice -lavformat -lavcodec -lavutil
+CFLAGS += -I /usr/local/include
 
-LDLIBS += -lm -lz
-#CFLAGS += -g
-
-ifdef AQUOSA
+ifdef CONFIG_AQUOSA
 CPPFLAGS += -I$(AQUOSA)/include
 LDFLAGS += -L$(AQUOSA)/lib
 LDLIBS += -lqreslib -lqmgrlib -lrt
@@ -23,4 +16,4 @@ endif
 bin_PROGRAMS=streamer
 streamer_SOURCES=streamer.c input.c codec.c output.c
 
-lib_LOADLIBES+= avformat avcodec avutil m z
+lib_LOADLIBES+= avformat avdevice swscale avcodec avutil m z

diff --git a/codec.c b/codec.c
index 849656218dc9db31a632a3dd0267dd874f6c7994..31338a24744880439aa4d8b48636825b1d493b56 100644 (file)
--- a/codec.c
+++ b/codec.c
@@ -7,9 +7,9 @@
 #include "libavcodec/avcodec.h"
 #include "libswscale/swscale.h"*/
 
-#include <avformat.h>
-#include <avcodec.h>
-#include <swscale.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
 
 struct resample_data {
   struct SwsContext *resample_ctx;

diff --git a/input.c b/input.c
index 31983349ded44ef959f782b5ee51b94e5ec3a7d9..14353b998172a17688cb50b0ea6b20ed2560b453 100644 (file)
--- a/input.c
+++ b/input.c
@@ -4,7 +4,7 @@
  *  This is free software; see GPL.txt
  */
 #include <string.h>
-#include <avformat.h>
+#include <libavformat/avformat.h>
 #include "input.h"
 
 static uint64_t time_convert(uint64_t time, AVStream *st)

diff --git a/output.c b/output.c
index 65e0897bbdc481e699a57a16ae403e0017d82575..260d58f926de857e20e97b71c7d0de7cb4cb521f 100644 (file)
--- a/output.c
+++ b/output.c
@@ -3,7 +3,7 @@
  *
  *  This is free software; see GPL.txt
  */
-#include <avformat.h>
+#include <libavformat/avformat.h>
 
 
 AVFormatContext *open_output_stream(const char *dst, int port, enum CodecType codec_type)

diff --git a/streamer.c b/streamer.c
index 84a320f153353439261e4dd1c5285c318e7115b0..b11021213624facf83bdc7093cdd5f459a44ab89 100644 (file)
--- a/streamer.c
+++ b/streamer.c
@@ -6,8 +6,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <avformat.h>
-//#include <avdevice.h>
+#include <libavformat/avformat.h>
+#include <libavdevice/avdevice.h>
+#include <libswscale/swscale.h>
 
 #include "input.h"
 #include "output.h"
@@ -105,7 +106,7 @@ int main(int argc, char *argv[])
       AVPacket *opkt;
 
       pkt->pts += s->streams[pkt->stream_index]->start_time;
-      rt_job_start(pkt->pts);
+      //rt_job_start(pkt->pts);
       f = pkt_decode(s, pkt);
       if (f) {
         opkt = pkt_encode(os, f);
@@ -113,7 +114,7 @@ int main(int argc, char *argv[])
           pkt_send(os, opkt);
         }
       }
-      rt_job_end();
+      //rt_job_end();
       av_free_packet(pkt);
     }
   }