diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 04:23:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 04:23:56 +0200 |
| commit | a676e48d394cf9972730859d62f537dfe0a9dce2 (patch) | |
| tree | 3907298c9cd51a8b9e77e8c11b2ff89799e07e38 /libavcodec/tiff.c | |
| parent | 952614b8996e33fe406ef91f537e5776cd55111c (diff) | |
| parent | 801c39e1e3058fc4ba822bfb5d8612d777111e32 (diff) | |
| download | ffmpeg-a676e48d394cf9972730859d62f537dfe0a9dce2.tar.gz | |
Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32'
* commit '801c39e1e3058fc4ba822bfb5d8612d777111e32':
dcadec: Use correct channel count in stereo downmix check
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tiff.c')
0 files changed, 0 insertions, 0 deletions