diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-23 19:56:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-23 19:56:37 +0100 |
| commit | 9a884b7b97c9780c84980560c88b3d3eca992101 (patch) | |
| tree | 3a3cdd1ba940e3feda20776743f54ff6fdecfdc1 /libswscale/utils.c | |
| parent | 9abe0bfb7f52d450c9c4b392d8c4b88007562b31 (diff) | |
| parent | 80239a8bb11f730d95f03dfbd0deab258b413b0e (diff) | |
Merge commit '80239a8bb11f730d95f03dfbd0deab258b413b0e' into release/2.2
* commit '80239a8bb11f730d95f03dfbd0deab258b413b0e':
af_channelmap: fix ONE_STR mapping mode
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libswscale/utils.c')
0 files changed, 0 insertions, 0 deletions