Skip to content

Commit 4991a34

Browse files
committed
Slim ffmpeg even more
Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>
1 parent 32f4bfc commit 4991a34

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

MarathonRecomp/apu/xma_decoder.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
#include <condition_variable>
1010

1111
extern "C" {
12-
#include <libavcodec/avcodec.h>
13-
#include <libavformat/avformat.h>
14-
#include <libavutil/channel_layout.h>
15-
#include <libavutil/opt.h>
16-
#include <libavutil/samplefmt.h>
17-
#include <libswresample/swresample.h>
12+
#include <libavcodec/avcodec.h>
1813
}
1914

2015
struct XMAPLAYBACKINIT {
@@ -26,11 +21,11 @@ struct XMAPLAYBACKINIT {
2621

2722
constexpr uint32_t kBytesPerPacket = 2048;
2823
constexpr uint32_t kBytesPerPacketHeader = 4;
29-
constexpr uint32_t kBytesPerPacketData =
30-
kBytesPerPacket - kBytesPerPacketHeader;
24+
constexpr uint32_t kBytesPerPacketData = kBytesPerPacket - kBytesPerPacketHeader;
3125
constexpr uint32_t kBytesPerSample = 2;
3226
constexpr uint32_t kSamplesPerFrame = 512;
3327
constexpr uint32_t kBytesPerFrameChannel = kSamplesPerFrame * kBytesPerSample;
28+
3429
struct XmaPlayback {
3530
uint32_t sampleRate;
3631
uint32_t outputBufferSize;

thirdparty/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if (NOT WIN32)
3030

3131
add_custom_command(
3232
OUTPUT ${FFMPEG_PATH}/config.h
33-
COMMAND ./configure --disable-everything --disable-programs --disable-all --disable-x86asm --disable-autodetect --disable-network --enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-decoder='xmaframes'
33+
COMMAND ./configure --disable-all --disable-autodetect --disable-network --enable-avcodec --enable-decoder='xmaframes'
3434
COMMENT "Configuring FFmpeg..."
3535
WORKING_DIRECTORY ${FFMPEG_PATH}
3636
)

0 commit comments

Comments
 (0)