diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp index 742976f915..5da841ce59 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp @@ -257,7 +257,7 @@ StreamBase::Open() fContext->pb = fIOContext; // Allocate our context and probe the input format - if (avformat_open_input(&fContext, "", NULL, NULL) < 0) { + if (avformat_open_input(&fContext, ".mod", NULL, NULL) < 0) { TRACE("StreamBase::Open() - avformat_open_input() failed!\n"); // avformat_open_input() frees the context in case of failure fContext = NULL; @@ -1505,7 +1505,7 @@ AVFormatReader::Sniff(int32* _streamCount) streamDeleter.Detach(); #ifdef TRACE_AVFORMAT_READER - dump_format(const_cast(stream->Context()), 0, "", 0); + av_dump_format(const_cast(stream->Context()), 0, "", 0); #endif if (_streamCount != NULL) diff --git a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp index 2856694b98..ed22c4e303 100644 --- a/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp +++ b/src/add-ons/media/plugins/ffmpeg/MuxerTable.cpp @@ -318,6 +318,62 @@ const media_file_format gMuxerTable[] = { "webm", { 0 } }, + { + media_file_format::B_READABLE + | media_file_format::B_KNOWS_RAW_AUDIO + | media_file_format::B_KNOWS_ENCODED_AUDIO, + { 0 }, + B_MISC_FORMAT_FAMILY, + 100, + { 0 }, + "audio/xm", + "Fast Tracker eXtended Module", + "xm", + "xm", + { 0 } + }, + { + media_file_format::B_READABLE + | media_file_format::B_KNOWS_RAW_AUDIO + | media_file_format::B_KNOWS_ENCODED_AUDIO, + { 0 }, + B_MISC_FORMAT_FAMILY, + 100, + { 0 }, + "audio/s3m", + "Scream Tracker 3", + "s3m", + "s3m", + { 0 } + }, + { + media_file_format::B_READABLE + | media_file_format::B_KNOWS_RAW_AUDIO + | media_file_format::B_KNOWS_ENCODED_AUDIO, + { 0 }, + B_MISC_FORMAT_FAMILY, + 100, + { 0 }, + "audio/it", + "Impulse Tracker", + "it", + "it", + { 0 } + }, + { + media_file_format::B_READABLE + | media_file_format::B_KNOWS_RAW_AUDIO + | media_file_format::B_KNOWS_ENCODED_AUDIO, + { 0 }, + B_MISC_FORMAT_FAMILY, + 100, + { 0 }, + "audio/x-mod", + "Protracker MOD", + "mod", + "mod", + { 0 } + }, }; const size_t gMuxerCount = sizeof(gMuxerTable) / sizeof(media_file_format);