diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2007-11-15 13:27:23 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2007-11-15 13:27:23 +0000 |
| commit | e2f098deac0432106d620df27d84dbd407b0635f (patch) | |
| tree | 3fb88886cf58b11a5a09a93efb364683a5dff68a /multimedia/dvbcut/files/patch-psfile.cpp | |
| parent | Mark broken: bad checksum. (diff) | |
Unbreak port: use functional interface to locate encoder/decoder functions
instead of references to global function pointers (which are no longer
exported by ffmpeg).
Approved by: portmgr (linimon)
Diffstat (limited to 'multimedia/dvbcut/files/patch-psfile.cpp')
| -rw-r--r-- | multimedia/dvbcut/files/patch-psfile.cpp | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/multimedia/dvbcut/files/patch-psfile.cpp b/multimedia/dvbcut/files/patch-psfile.cpp index 822a4193d31d..fe7b3fd3f64c 100644 --- a/multimedia/dvbcut/files/patch-psfile.cpp +++ b/multimedia/dvbcut/files/patch-psfile.cpp @@ -1,22 +1,41 @@ --- src/psfile.cpp~ 2007-04-13 19:36:27.000000000 +0200 -+++ src/psfile.cpp 2007-08-19 11:51:11.554951537 +0200 ++++ src/psfile.cpp 2007-11-15 09:40:42.110171154 +0100 @@ -19,7 +19,9 @@ #include "psfile.h" #include "streamhandle.h" #include "stream.h" +extern "C" { --#include <ffmpeg/avcodec.h> -+#include <ffmpeg/allcodecs.h> + #include <ffmpeg/avcodec.h> +} psfile::psfile(const std::string &filename, inbuffer &b, int initial_offset) : mpgfile(filename, b, initial_offset) +@@ -90,7 +92,7 @@ + streamnumber[sid]=audiostream(audiostreams); + stream *S=&s[audiostream(audiostreams++)]; + S->id=sid; +- S->dec=&mp2_decoder; ++ S->dec=avcodec_find_decoder(CODEC_ID_MP2); + S->type=streamtype::mpegaudio; + if (audiostreams>=MAXAUDIOSTREAMS) + break; @@ -100,7 +102,7 @@ streamnumber[sid]=audiostream(audiostreams); stream *S=&s[audiostream(audiostreams++)]; S->id=sid; - S->dec=&ac3_decoder; -+ S->dec=&liba52_decoder; ++ S->dec=avcodec_find_decoder(CODEC_ID_AC3); S->type=streamtype::ac3audio; if (audiostreams>=MAXAUDIOSTREAMS) break; +@@ -114,8 +116,8 @@ + S->allocavcc(); + S->avcc->codec_type=CODEC_TYPE_VIDEO; + S->avcc->codec_id=CODEC_ID_MPEG2VIDEO; +- S->dec=&mpeg2video_decoder; +- S->enc=&mpeg2video_encoder; ++ S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO); ++ S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO); + S->type=streamtype::mpeg2video; + } + |