diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:29:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:29:22 +0100 |
| commit | 9bbe24d455a35a91e3b19303922ce4d58fa8d4ad (patch) | |
| tree | e5dd1670f1638af954e2748f461f77e777d133ee /compat/msvcrt/snprintf.c | |
| parent | 6e5dd43bf9099a72de04ccc8a65dd1c4939aed92 (diff) | |
| parent | 03dba25a4001495226651068232b4c6b1e75fd02 (diff) | |
| download | ffmpeg-9bbe24d455a35a91e3b19303922ce4d58fa8d4ad.tar.gz | |
Merge commit '03dba25a4001495226651068232b4c6b1e75fd02' into release/1.1
* commit '03dba25a4001495226651068232b4c6b1e75fd02':
mmvideo: check frame dimensions
Conflicts:
libavcodec/mmvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/msvcrt/snprintf.c')
0 files changed, 0 insertions, 0 deletions