Triode wrote:
> That was a bug in the makefile - you should not need to have the soxr
> headers now if you don't specify OPTS=-DRESAMPLE
>
> I've also added ffmpeg support for osx (slight change to your patch but
> hopefully does the same thing and will allow me to add msvc support
> soon)
Thanks.
The log_info calls for the ffmpeg library versions in ffmpeg.c no longer
prints the correct library versions as the avlib define names contain
%d.
Code:
--------------------
[07:31:10.499683] load_ff:600 loaded libavcodec.so.55 (18.102.257476)
[07:31:10.501468] load_ff:620 loaded libavformat.so.55 (12.100.257476)
[07:31:10.501827] load_ff:635 loaded libavutil.so.52 (38.100.257476)]
--------------------
This patch fixes it.
Code:
--------------------
Index: ffmpeg.c
===================================================================
--- ffmpeg.c (revision 295)
+++ ffmpeg.c (working copy)
@@ -597,7 +597,7 @@
}
ff->avcodec_v = ff->avcodec_version();
- LOG_INFO("loaded "LIBAVCODEC" (%u.%u.%u)", ff->avcodec_v >> 16,
(ff->avcodec_v >> 8) & 0xff, ff->avcodec_v & 0xff);
+ LOG_INFO("loaded "LIBAVCODEC" (%u.%u.%u)", LIBAVCODEC_VERSION_MAJOR,
ff->avcodec_v >> 16, (ff->avcodec_v >> 8) & 0xff, ff->avcodec_v & 0xff);
ff->avformat_version = dlsym(handle_format, "avformat_version");
ff->avformat_alloc_context = dlsym(handle_format, "avformat_alloc_context");
@@ -617,7 +617,7 @@
}
ff->avformat_v = ff->avformat_version();
- LOG_INFO("loaded "LIBAVFORMAT" (%u.%u.%u)", ff->avformat_v >> 16,
(ff->avformat_v >> 8) & 0xff, ff->avformat_v & 0xff);
+ LOG_INFO("loaded "LIBAVFORMAT" (%u.%u.%u)",
LIBAVFORMAT_VERSION_MAJOR, ff->avformat_v >> 16, (ff->avformat_v >> 8) & 0xff,
ff->avformat_v & 0xff);
ff->avutil_version = dlsym(handle_util, "avutil_version");
ff->av_log_set_callback = dlsym(handle_util, "av_log_set_callback");
@@ -632,7 +632,7 @@
}
ff->avutil_v = ff->avutil_version();
- LOG_INFO("loaded "LIBAVUTIL" (%u.%u.%u)", ff->avutil_v >> 16,
(ff->avutil_v >> 8) & 0xff, ff->avutil_v & 0xff);
+ LOG_INFO("loaded "LIBAVUTIL" (%u.%u.%u)", LIBAVUTIL_VERSION_MAJOR,
ff->avutil_v >> 16, (ff->avutil_v >> 8) & 0xff, ff->avutil_v & 0xff);
return true;
}
--------------------
Code:
--------------------
[08:17:35.594450] load_ff:600 loaded libavcodec.so.55 (55.18.102)
[08:17:35.594718] load_ff:620 loaded libavformat.so.55 (55.12.100)
[08:17:35.595032] load_ff:635 loaded libavutil.so.52 (52.38.100)
--------------------
Ralphy
*1*-Touch, *4*-Classics, *2*-Booms, *1*-Squeezeslave, *3*-Squeezeplays,
*4*-Squeezelites
'Squeezeslave' (http://code.google.com/p/squeezeslave/) 'donations'
(https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=LL5P6365KQEXN&lc=CA&item_name=Squeezeslave¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted)
always appreciated.
------------------------------------------------------------------------
ralphy's Profile: http://forums.slimdevices.com/member.php?userid=3484
View this thread: http://forums.slimdevices.com/showthread.php?t=97046
_______________________________________________
unix mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/unix
