[packages] mocp: build with newer ffmpeg (#10082)
authorloswillios <loswillios@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 11 Sep 2011 08:33:26 +0000 (08:33 +0000)
committerloswillios <loswillios@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 11 Sep 2011 08:33:26 +0000 (08:33 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@28210 3c298f89-4303-0410-b956-a3cf2f4a3e73

sound/mocp/patches/001-moc-ffmpeg-update.patch [new file with mode: 0644]

diff --git a/sound/mocp/patches/001-moc-ffmpeg-update.patch b/sound/mocp/patches/001-moc-ffmpeg-update.patch
new file mode 100644 (file)
index 0000000..a9c5615
--- /dev/null
@@ -0,0 +1,34 @@
+--- a/decoder_plugins/ffmpeg/ffmpeg.c
++++ b/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -81,14 +81,14 @@ static void ffmpeg_info (const char *fil
+       }
+       if (tags_sel & TAGS_COMMENTS) {
+-              if (ic->track != 0)
+-                      info->track = ic->track;
+-              if (ic->title[0] != 0)
+-                      info->title = xstrdup (ic->title);
+-              if (ic->author[0] != 0)
+-                      info->artist = xstrdup (ic->author);
+-              if (ic->album[0] != 0)
+-                      info->album = xstrdup (ic->album);
++              if (av_metadata_get(ic->metadata, "track", NULL, 0) != NULL)
++                              info->track = atoi(av_metadata_get(ic->metadata, "track", NULL, 0)->value);
++              if (av_metadata_get(ic->metadata, "title", NULL, 0) != NULL)
++                              info->title = xstrdup (av_metadata_get(ic->metadata, "title", NULL, 0)->value);
++              if (av_metadata_get(ic->metadata, "author", NULL, 0) != NULL)
++                              info->artist = xstrdup (av_metadata_get(ic->metadata, "author", NULL, 0)->value);
++              if (av_metadata_get(ic->metadata, "album", NULL, 0) != NULL)
++                              info->album = xstrdup (av_metadata_get(ic->metadata, "album", NULL, 0)->value);
+       }
+       if (tags_sel & TAGS_TIME)
+@@ -127,7 +127,7 @@ static void *ffmpeg_open (const char *fi
+       av_read_play (data->ic);
+       for (i = 0; i < data->ic->nb_streams; i++) {
+               data->enc = data->ic->streams[i]->codec;
+-              if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
++              if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
+                       audio_index = i;
+                       break;
+               }