diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:13:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-20 14:14:53 +0200 |
| commit | e0f859e8fe141c7bb23a99c70229199508b964c2 (patch) | |
| tree | a3a607219732d0fd9349d83a75456a6f1f808565 /libavfilter/vf_psnr.c | |
| parent | 7da1e8a0d89159912ff1b1ac0525e5e8719f2c52 (diff) | |
| parent | 859ce02c9815b492da627d3098548b4f69bbc80e (diff) | |
| download | ffmpeg-e0f859e8fe141c7bb23a99c70229199508b964c2.tar.gz | |
Merge commit '859ce02c9815b492da627d3098548b4f69bbc80e' into release/2.4
* commit '859ce02c9815b492da627d3098548b4f69bbc80e':
h263: Always check both dimensions
Conflicts:
libavcodec/ituh263dec.c
See: 62006b539ddda23594febf0fcb2f21c03de60457
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/vf_psnr.c')
0 files changed, 0 insertions, 0 deletions