diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:17:55 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:20:26 +0200 |
commit | f141ac2d7028d982d55219d05dc0b647c2502527 (patch) | |
tree | dc9c3e904bb54876db9c009daea87d38f0e11344 /libavfilter/vf_psnr.c | |
parent | e0f859e8fe141c7bb23a99c70229199508b964c2 (diff) | |
parent | c49b88b93bca53c04f18d78c27dbf1dc6daea909 (diff) | |
download | ffmpeg-f141ac2d7028d982d55219d05dc0b647c2502527.tar.gz |
Merge commit 'c49b88b93bca53c04f18d78c27dbf1dc6daea909' into release/2.4
* commit 'c49b88b93bca53c04f18d78c27dbf1dc6daea909':
opusdec: properly handle mismatching configurations in multichannel streams
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_psnr.c')
0 files changed, 0 insertions, 0 deletions