[packages/mpeg4ip] - fix build with ffmpeg 1.0 - remove mp4v2 libs, they are now in separate package - rel 21
baggins
baggins at pld-linux.org
Tue Nov 13 13:18:24 CET 2012
commit 5e3551c0f818fa25ffb42e7414a17e05d198151d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Nov 13 13:17:49 2012 +0100
- fix build with ffmpeg 1.0
- remove mp4v2 libs, they are now in separate package
- rel 21
mpeg4ip-ffmpeg.patch | 63 ++++++++++++++++++++++++++++++++++++++++++++--
mpeg4ip-remove-mp4v2.patch | 8 ++++++
mpeg4ip.spec | 4 ++-
3 files changed, 72 insertions(+), 3 deletions(-)
---
diff --git a/mpeg4ip.spec b/mpeg4ip.spec
index 8b27700..5e85aec 100644
--- a/mpeg4ip.spec
+++ b/mpeg4ip.spec
@@ -7,7 +7,7 @@ Summary: MPEG4IP - system for encoding, streaming and playing MPEG-4 audio/video
Summary(pl.UTF-8): MPEG4IP - system kodowania, streamingu i odtwarzania dźwięku i obrazu MPEG-4
Name: mpeg4ip
Version: 1.6.1
-Release: 20
+Release: 21
Epoch: 1
License: MPL v1.1 (original code) and other licenses (included libraries)
Group: Applications
@@ -24,6 +24,7 @@ Patch5: %{name}-ffmpeg.patch
Patch6: gcc44.patch
Patch7: %{name}-srtp.patch
Patch8: %{name}-v4l2.patch
+Patch9: %{name}-remove-mp4v2.patch
URL: http://www.mpeg4ip.net/
BuildRequires: SDL-devel
BuildRequires: a52dec-libs-devel
@@ -134,6 +135,7 @@ This package contains the mp4 server.
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
cd lib/SDLAudio
diff --git a/mpeg4ip-ffmpeg.patch b/mpeg4ip-ffmpeg.patch
index d95a0a6..3c3568e 100644
--- a/mpeg4ip-ffmpeg.patch
+++ b/mpeg4ip-ffmpeg.patch
@@ -68,6 +68,14 @@ diff -burNp mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-new/configure.in
#endif
--- mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.cpp 2007-07-02 22:26:03.000000000 +0200
+++ mpeg4ip-1.6.1-new/player/plugin/video/ffmpeg/ffmpeg.cpp 2008-10-10 23:01:19.519476374 +0200
+@@ -186,7 +186,6 @@
+
+ ffmpeg->m_vft = vft;
+ ffmpeg->m_ifptr = ifptr;
+- avcodec_init();
+ avcodec_register_all();
+ av_log_set_level(AV_LOG_QUIET);
+
@@ -585,10 +585,16 @@ static int ffmpeg_decode (codec_data_t *
from.data[ix] = ffmpeg->m_picture->data[ix];
from.linesize[ix] = ffmpeg->m_picture->linesize[ix];
@@ -89,8 +97,24 @@ diff -burNp mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-new/configure.in
ffmpeg->m_vft->video_filled_buffer(ffmpeg->m_ifptr,
ffmpeg->have_cached_ts ?
ffmpeg->cached_ts : ts);
+@@ -635,7 +634,6 @@
+ {
+ enum CodecID fcodec;
+ AVCodec *c;
+- avcodec_init();
+ avcodec_register_all();
+ av_log_set_level(AV_LOG_QUIET);
+ fcodec = ffmpeg_find_codec(stream_type, compressor, type, profile,
--- mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.cpp~ 2011-07-26 18:37:06.785253535 +0200
+++ mpeg4ip-1.6.1/player/plugin/audio/ffmpeg/ffmpeg.cpp 2011-07-26 18:43:29.810426398 +0200
+@@ -135,7 +135,6 @@
+
+ ffmpeg->m_vft = vft;
+ ffmpeg->m_ifptr = ifptr;
+- avcodec_init();
+ avcodec_register_all();
+
+ ffmpeg->m_codecId = ffmpeg_find_codec(stream_type, compressor, type,
@@ -220,14 +220,13 @@
uint32_t freq_ts = pts->audio_freq_timestamp;
@@ -113,6 +137,14 @@ diff -burNp mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-new/configure.in
if (used < 0) {
ffmpeg_message(LOG_DEBUG, "ffmpeg", "failed to decode at "U64,
ts);
+@@ -288,7 +288,6 @@
+ {
+ enum CodecID fcodec;
+ AVCodec *c;
+- avcodec_init();
+ avcodec_register_all();
+
+ fcodec = ffmpeg_find_codec(stream_type, compressor, type, profile,
--- mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.cpp.orig 2011-07-26 13:26:04.684844016 +0200
+++ mpeg4ip-1.6.1/player/plugin/video/ffmpeg/ffmpeg.cpp 2011-07-26 21:00:12.921661697 +0200
@@ -295,11 +295,13 @@
@@ -155,6 +187,14 @@ diff -burNp mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-new/configure.in
got_picture |= local_got_picture;
--- mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.cpp~ 2006-09-29 21:55:42.000000000 +0200
+++ mpeg4ip-1.6.1/server/mp4live/audio_ffmpeg.cpp 2011-07-26 22:13:07.825014397 +0200
+@@ -442,7 +442,6 @@
+ {
+ const char *encoding = Profile()->GetStringValue(CFG_AUDIO_ENCODING);
+
+- avcodec_init();
+ avcodec_register_all();
+
+ if (strcasecmp(encoding,AUDIO_ENCODING_MP3) == 0) {
@@ -475,7 +475,7 @@
m_avctx = avcodec_alloc_context();
m_frame = avcodec_alloc_frame();
@@ -164,11 +204,30 @@ diff -burNp mpeg4ip-1.6.1/configure.in mpeg4ip-1.6.1-new/configure.in
switch (m_media_frame) {
case MP3AUDIOFRAME:
m_avctx->codec_id = CODEC_ID_MP2;
+@@ -647,7 +646,6 @@
+ AddAudioEncoderTable(&ffmpeg_alaw_audio_encoder_table);
+ AddAudioEncoderTable(&ffmpeg_ulaw_audio_encoder_table);
+ #ifdef MAY_HAVE_AMR_CODEC
+- avcodec_init();
+ avcodec_register_all();
+ bool have_amr_nb = avcodec_find_encoder(CODEC_ID_AMR_NB) != NULL;
+ bool have_amr_wb = avcodec_find_encoder(CODEC_ID_AMR_WB) != NULL;
--- mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.cpp~ 2007-01-30 22:53:45.000000000 +0100
+++ mpeg4ip-1.6.1/server/mp4live/video_ffmpeg.cpp 2011-07-26 22:17:55.917224166 +0200
-@@ -225,7 +225,7 @@
+@@ -72,7 +72,6 @@
+
+ bool CFfmpegVideoEncoder::Init (void)
+ {
+- avcodec_init();
+ avcodec_register_all();
+
+ if (m_push != NULL) {
+@@ -222,9 +222,9 @@
+ m_count = 0;
+ }
}
- if (wantKeyFrame) m_picture->pict_type = FF_I_TYPE; //m_picture->key_frame = 1;
+- if (wantKeyFrame) m_picture->pict_type = FF_I_TYPE; //m_picture->key_frame = 1;
++ if (wantKeyFrame) m_picture->pict_type = AV_PICTURE_TYPE_I; //m_picture->key_frame = 1;
else //m_picture->key_frame = 0;
- m_picture->pict_type = 0;
+ m_picture->pict_type = AV_PICTURE_TYPE_NONE;
diff --git a/mpeg4ip-remove-mp4v2.patch b/mpeg4ip-remove-mp4v2.patch
new file mode 100644
index 0000000..1b575d3
--- /dev/null
+++ b/mpeg4ip-remove-mp4v2.patch
@@ -0,0 +1,8 @@
+--- mpeg4ip-1.6.1/lib/Makefile.am~ 2006-09-29 21:55:39.000000000 +0200
++++ mpeg4ip-1.6.1/lib/Makefile.am 2012-11-13 13:02:07.730778548 +0100
+@@ -8,4 +8,4 @@
+ endif
+ endif
+
+-SUBDIRS = utils audio avi ffmpeg fposrec gnu ismacryp mp4av mp4 mp4v2 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)
++SUBDIRS = utils audio avi ffmpeg fposrec gnu ismacryp mp4av mp4 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mpeg4ip.git/commitdiff/5e3551c0f818fa25ffb42e7414a17e05d198151d
More information about the pld-cvs-commit
mailing list