diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-21 21:23:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-21 21:23:14 +0200 |
| commit | 24e81a0a8d86e764dfb89cb21e9caa4aff073e1c (patch) | |
| tree | 087d3f24d4603982f1fc13c67162a89db1ebdc45 /libavutil/adler32.c | |
| parent | 54ca4dd43bdc8658b7304d9309cdb096c8e8a394 (diff) | |
| parent | 11cd727fbd603197cb1e49654fce3352d56f8fd8 (diff) | |
| download | ffmpeg-24e81a0a8d86e764dfb89cb21e9caa4aff073e1c.tar.gz | |
Merge commit '11cd727fbd603197cb1e49654fce3352d56f8fd8'
* commit '11cd727fbd603197cb1e49654fce3352d56f8fd8':
vsrc_movie: Adjust a silly typo from b977b287f61fea48ecd6251d54a26334213b7ec6
Conflicts:
libavfilter/src_movie.c
No change, the typo is not part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/adler32.c')
0 files changed, 0 insertions, 0 deletions