History

libavfilter/af_amerge: Do not depend on SWR_CH_MAX

Michael Niedermayer committed 12 years ago

Commit 36bce991 parent ce1bb4b1 file · +2 −1Browse files

Unified · Split

libavfilter/af_amerge.c+2−1
@@ -27,12 +27,13 @@ · 26 unmodified lines
27#include "libavutil/bprint.h"27#include "libavutil/bprint.h"
28#include "libavutil/channel_layout.h"28#include "libavutil/channel_layout.h"
29#include "libavutil/opt.h"29#include "libavutil/opt.h"
30#include "libswresample/swresample.h" // only for SWR_CH_MAX
31#include "avfilter.h"30#include "avfilter.h"
32#include "audio.h"31#include "audio.h"
33#include "bufferqueue.h"32#include "bufferqueue.h"
34#include "internal.h"33#include "internal.h"
35 34
35#define SWR_CH_MAX 32
36
36typedef struct {37typedef struct {
37 const AVClass *class;38 const AVClass *class;
38 int nb_inputs;39 int nb_inputs;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t