feb1b928bb
Update libdlna to 0.2.4. Drop 100-configure_fix.patch. This was a mix of configure fixes and changes to build with newer ffmpeg versions. The ffmpeg changes are integrated. The configure changes are rolled into a new patch, 010-configure-crosscompile.patch, so it will hopefully stay single purpose changes. Rebase 300-ffmpeg_compat.patch. Note: This is compile tested only. Signed-off-by: Ian Leonard <antonlacon@gmail.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/packages@35796 3c298f89-4303-0410-b956-a3cf2f4a3e73
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
--- a/src/profiles.c
|
|
+++ b/src/profiles.c
|
|
@@ -205,13 +205,13 @@ av_profile_get_codecs (AVFormatContext *
|
|
for (i = 0; i < ctx->nb_streams; i++)
|
|
{
|
|
if (audio_stream == -1 &&
|
|
- ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
|
|
+ ctx->streams[i]->codec->codec_type == LIBDLNA_CODEC_TYPE_AUDIO)
|
|
{
|
|
audio_stream = i;
|
|
continue;
|
|
}
|
|
else if (video_stream == -1 &&
|
|
- ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
|
|
+ ctx->streams[i]->codec->codec_type == LIBDLNA_CODEC_TYPE_VIDEO)
|
|
{
|
|
video_stream = i;
|
|
continue;
|
|
--- a/src/profiles.h
|
|
+++ b/src/profiles.h
|
|
@@ -25,6 +25,14 @@
|
|
#include <libavcodec/avcodec.h>
|
|
#include <libavformat/avformat.h>
|
|
|
|
+#if (LIBAVCODEC_VERSION_MAJOR > 52)
|
|
+# define LIBDLNA_CODEC_TYPE_AUDIO (AVMEDIA_TYPE_AUDIO)
|
|
+# define LIBDLNA_CODEC_TYPE_VIDEO (AVMEDIA_TYPE_VIDEO)
|
|
+#else
|
|
+# define LIBDLNA_CODEC_TYPE_AUDIO (CODEC_TYPE_AUDIO)
|
|
+# define LIBDLNA_CODEC_TYPE_VIDEO (CODEC_TYPE_VIDEO)
|
|
+#endif
|
|
+
|
|
#include "dlna_internals.h"
|
|
#include "containers.h"
|
|
|