diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 13:19:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 13:19:11 +0100 |
| commit | 8943ad40146d322f5a5bf2bab790d117ec7a4c37 (patch) | |
| tree | 3aa57b91ebe60e9958219e944db3d675e6972ba7 /libavfilter | |
| parent | f9f79cb0ecb68546e6de3db6072f631bb3fbcff8 (diff) | |
| parent | 4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26 (diff) | |
| download | ffmpeg-8943ad40146d322f5a5bf2bab790d117ec7a4c37.tar.gz | |
Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
avio: fix pointer type mismatches in avio_enum_protocols()
avserver: use socklen_t where appropriate
udp: use socklen_t where appropriate
network: use HAVE_THREADS instead of local hack
af_channelmap: remove stray enum declaration
buffersink: remove stray semicolon after function definition
Conflicts:
libavformat/avio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_channelmap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 6e3f021f10..57ad0e0ff7 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -125,7 +125,6 @@ static av_cold int channelmap_init(AVFilterContext *ctx, const char *args) ChannelMapContext *s = ctx->priv; int ret; char *mapping; - enum mode; int map_entries = 0; char buf[256]; enum MappingMode mode; |