ffmpeg/libavfilter
Michael Niedermayer 9c31b39641 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>
2015-07-23 11:57:45 +02:00
..
2015-07-20 13:18:05 -03:00
2015-04-11 20:39:43 +00:00
2015-07-22 15:52:02 +00:00
2014-05-03 20:08:18 +02:00
2015-03-18 12:19:08 +01:00
2014-06-03 10:58:19 -08:00
2013-09-30 08:47:40 +00:00
2015-07-03 18:43:21 +00:00
2014-08-13 01:00:38 +02:00
2015-07-22 15:52:02 +00:00
2015-01-06 10:02:11 +00:00
2015-01-05 01:45:49 +01:00
2015-07-22 15:52:02 +00:00
2015-07-18 05:01:16 +00:00
2015-07-22 15:52:02 +00:00
2015-03-20 09:41:32 +01:00
2014-12-26 15:39:51 -03:00
2015-07-03 16:58:56 +00:00
2015-01-09 17:26:31 +01:00
2015-07-19 19:01:00 +00:00
2015-07-19 14:13:51 +01:00