diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-13 04:07:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-13 04:07:27 +0200 |
| commit | 952614b8996e33fe406ef91f537e5776cd55111c (patch) | |
| tree | 848cfd5d9f1368b85b6863317a3b9378f8376836 /libavresample/resample.c | |
| parent | d7644e0fdb5c6ba58091b62a27ba9eda4fd159f0 (diff) | |
| parent | c8cf461c19e8e35df4b7364d9b90aa42f1ab4560 (diff) | |
Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560'
* commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560':
dcadec: Do not decode the XCh extension when downmixing to stereo
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavresample/resample.c')
0 files changed, 0 insertions, 0 deletions