ssuominen 14/07/10 17:59:35
Added: cinelerra-20140710-underlinking.patch
cinelerra-20140710-validate_desktop_entry.patch
cinelerra-20140710-ffmpeg-0.11.patch
Log:
Create a new Cinelerra CV snapshot from git wrt #516850 by Michał Górny
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
4868F14D)
Revision Changes Path
1.1
media-video/cinelerra/files/cinelerra-20140710-underlinking.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-underlinking.patch?rev=1.1&content-type=text/plain
Index: cinelerra-20140710-underlinking.patch
===================================================================
http://bugs.gentoo.org/367509
pluginserver.C is using dlsym, dlopen, dlclose and dlerror
--- cinelerra/Makefile.am
+++ cinelerra/Makefile.am
@@ -692,7 +692,8 @@
$(LIBDV_LIBS) \
-luuid \
$(MJPEG_LIBS) \
- -lstdc++
+ -lstdc++ \
+ -ldl
EXTRA_DIST = gen-feather-h
1.1
media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-validate_desktop_entry.patch?rev=1.1&content-type=text/plain
Index: cinelerra-20140710-validate_desktop_entry.patch
===================================================================
--- image/cinelerra-cv.desktop
+++ image/cinelerra-cv.desktop
@@ -5,9 +5,8 @@
Name[fr]=Cinelerra-CV
Name[es]=Cinelerra-CV
Comment=Video Editor
-Categories=Application;AudioVideo;Multimedia;VideoEditing;
-Encoding=UTF-8
+Categories=AudioVideo;
Exec=cinelerra
-Icon=cinelerra-cv.xpm
+Icon=cinelerra-cv
Terminal=false
Type=Application
1.1
media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/cinelerra/files/cinelerra-20140710-ffmpeg-0.11.patch?rev=1.1&content-type=text/plain
Index: cinelerra-20140710-ffmpeg-0.11.patch
===================================================================
--- cinelerra/ffmpeg.C
+++ cinelerra/ffmpeg.C
@@ -23,7 +23,6 @@
int FFMPEG::init(char *codec_string) {
- avcodec_init();
avcodec_register_all();
CodecID id = codec_id(codec_string);
--- cinelerra/fileac3.C
+++ cinelerra/fileac3.C
@@ -84,7 +84,6 @@
if(wr)
{
- avcodec_init();
avcodec_register_all();
codec = avcodec_find_encoder(CODEC_ID_AC3);
if(!codec)
--- configure.ac
+++ configure.ac
@@ -497,7 +497,7 @@
AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use
external ffmpeg library]))
if test "x$with_external_ffmpeg" = "xyes"; then
- PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc])
+ PKG_CHECK_MODULES([FFMPEG_TEMP], [libavcodec libpostproc libavutil])
FFMPEG_FOLDER=""
FFMPEG_EXTERNALTEXT="External ffmpeg"
@@ -515,10 +515,10 @@
AC_MSG_RESULT($enable_ffmpeg_swscale)
if test x"$enable_ffmpeg_swscale" = xyes; then
dnl AC_DEFINE(HAVE_SWSCALER)
- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale])
+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libswscale
libavutil])
FFMPEG_CFLAGS="$FFMPEG_CFLAGS -I/usr/include/libavcodec
-I/usr/include/libswscale -DHAVE_SWSCALER"
else
- PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
+ PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc libavutil])
fi
FFMPEG_EXTERNALTEXT="External ffmpeg"
else
--- quicktime/mpeg4.c
+++ quicktime/mpeg4.c
@@ -624,12 +624,12 @@
else
// ffmpeg section
{
+ AVDictionary ** opts = NULL;
static char *video_rc_eq="tex^qComp";
codec->encode_initialized[current_field] = 1;
if(!ffmpeg_initialized)
{
ffmpeg_initialized = 1;
- avcodec_init();
avcodec_register_all();
}
@@ -673,8 +673,10 @@
context->b_quant_offset = 1.25;
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
context->error_resilience = FF_ER_CAREFUL;
-#else
+#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
context->error_recognition = FF_ER_CAREFUL;
+#else
+ context->err_recognition |= AV_EF_CAREFUL;
#endif
context->error_concealment = 3;
context->frame_skip_cmp = FF_CMP_DCTMAX;
@@ -699,7 +701,7 @@
context->profile= FF_PROFILE_UNKNOWN;
context->rc_buffer_aggressivity = 1.0;
context->level= FF_LEVEL_UNKNOWN;
- context->flags |= CODEC_FLAG_H263P_UMV;
+ av_dict_set(opts, "umv", "1", 0);
context->flags |= CODEC_FLAG_AC_PRED;
// All the forbidden settings can be extracted from libavcodec/mpegvideo.c of
ffmpeg...
@@ -717,10 +719,8 @@
(codec->ffmpeg_id == CODEC_ID_MPEG4 ||
codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
- codec->ffmpeg_id == CODEC_ID_H263P ||
- codec->ffmpeg_id ==
CODEC_FLAG_H263P_SLICE_STRUCT))
+ codec->ffmpeg_id == CODEC_ID_H263P ))
{
- avcodec_thread_init(context, file->cpus);
context->thread_count = file->cpus;
}
@@ -740,7 +740,7 @@
* codec->fix_bitrate,
* codec->quantizer);
*/
- avcodec_open(context, codec->encoder[current_field]);
+ avcodec_open2(context, codec->encoder[current_field],
opts);
avcodec_get_frame_defaults(&codec->picture[current_field]);
--- quicktime/qtffmpeg.c
+++ quicktime/qtffmpeg.c
@@ -54,7 +54,6 @@
if(!ffmpeg_initialized)
{
ffmpeg_initialized = 1;
- avcodec_init();
avcodec_register_all();
}
@@ -90,10 +89,8 @@
(ffmpeg_id == CODEC_ID_MPEG4 ||
ffmpeg_id == CODEC_ID_MPEG1VIDEO ||
ffmpeg_id == CODEC_ID_MPEG2VIDEO ||
- ffmpeg_id == CODEC_ID_H263P ||
- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT))
+ ffmpeg_id == CODEC_ID_H263P ))
{
- avcodec_thread_init(context, cpus);
context->thread_count = cpus;
}
if(avcodec_open(context,
--- quicktime/wma.c
+++ quicktime/wma.c
@@ -67,7 +67,6 @@
if(!ffmpeg_initialized)
{
ffmpeg_initialized = 1;
- avcodec_init();
avcodec_register_all();
}
