diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:31:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:31:40 +0100 |
| commit | 8439378f41e34737499858eff8bafb930aee50ca (patch) | |
| tree | e7618aec84226e64ccf23fc574de0b8ddb018c6c /libavfilter/vf_aspect.c | |
| parent | 17f094697db962e2b4b0aba62f31052c54dfb305 (diff) | |
| parent | fc159ba88ea2dd1fa11e4ab6af8b574fc80db454 (diff) | |
| download | ffmpeg-8439378f41e34737499858eff8bafb930aee50ca.tar.gz | |
Merge commit 'fc159ba88ea2dd1fa11e4ab6af8b574fc80db454' into release/0.10
* commit 'fc159ba88ea2dd1fa11e4ab6af8b574fc80db454':
mmvideo: check frame dimensions
Conflicts:
libavcodec/mmvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_aspect.c')
0 files changed, 0 insertions, 0 deletions