diff options
| author |  waker <wakeroid@gmail.com> | 2010-11-08 20:20:55 +0100 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2010-11-08 20:21:32 +0100 |
| commit | 0b9669259004bbe9050dfbcbe8196d8c17ac119c (patch) | |
| tree | e979e6354466d3caa819668d2086fe3ea3b01d40 /plugins/ffmpeg | |
| parent | 77b9ae5b8fc81fddb0d7c5ca455e8b0b56399909 (diff) | |
bumped ffmpeg to 1.2: added support for AMR format
Diffstat (limited to 'plugins/ffmpeg')
| -rw-r--r-- | plugins/ffmpeg/ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/ffmpeg/ffmpeg.c | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/plugins/ffmpeg/ChangeLog b/plugins/ffmpeg/ChangeLog index a3edb5f1..f3179866 100644 --- a/plugins/ffmpeg/ChangeLog +++ b/plugins/ffmpeg/ChangeLog @@ -1,2 +1,5 @@ +version 1.2 + Added AMR support via libopencore + version 1.1 Switched to ffmpeg commit 25472 diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c index 498f0332..89917c83 100644 --- a/plugins/ffmpeg/ffmpeg.c +++ b/plugins/ffmpeg/ffmpeg.c @@ -55,7 +55,7 @@ static DB_decoder_t plugin; static DB_functions_t *deadbeef; -static const char * exts[] = { "m4a", "wma", "aa3", "oma", "ac3", "vqf", NULL }; +static const char * exts[] = { "m4a", "wma", "aa3", "oma", "ac3", "vqf", "amr", NULL }; enum { FT_ALAC = 0, @@ -63,10 +63,11 @@ enum { FT_ATRAC3 = 2, FT_VQF = 3, FT_AC3 = 4, + FT_AMR = 5, FT_UNKNOWN = 5 }; -static const char *filetypes[] = { "ALAC", "WMA", "ATRAC3", "VQF", "AC3", "FFMPEG (unknown)", NULL }; +static const char *filetypes[] = { "ALAC", "WMA", "ATRAC3", "VQF", "AC3", "AMR", "FFMPEG (unknown)", NULL }; #define FF_PROTOCOL_NAME "deadbeef" @@ -169,6 +170,9 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { else if (strcasestr (info->codec->name, "ac3")) { it->filetype = filetypes[FT_AC3]; } + else if (strcasestr (info->codec->name, "amr")) { + it->filetype = filetypes[FT_AMR]; + } else { it->filetype = filetypes[FT_UNKNOWN]; } @@ -715,7 +719,7 @@ ffmpeg_read_metadata (DB_playItem_t *it) { static DB_decoder_t plugin = { DB_PLUGIN_SET_API_VERSION .plugin.version_major = 1, - .plugin.version_minor = 1, + .plugin.version_minor = 2, .plugin.type = DB_PLUGIN_DECODER, .plugin.id = "ffmpeg", .plugin.name = "FFMPEG audio player", |