diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 11:56:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-23 11:57:45 +0200 |
| commit | 9c31b396413a90f55e82a01cb6b6f1fbe048a156 (patch) | |
| tree | 4a725a911462670c4be576e2f1aefc47e5aeaa5b /libavformat/pmpdec.c | |
| parent | 40e8ade9ebda8286a0291c575c874755670ce81f (diff) | |
| parent | 22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4 (diff) | |
| download | ffmpeg-9c31b396413a90f55e82a01cb6b6f1fbe048a156.tar.gz | |
Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'
* commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4':
af_channelmap: properly set the supported output channel layouts
Conflicts:
libavfilter/af_channelmap.c
See: 39867f3e098ab304cd3bef0ace19d73617cdb817
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/pmpdec.c')
0 files changed, 0 insertions, 0 deletions