diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 21:49:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 21:50:53 +0200 |
| commit | 647fe2e77733edf6e3a15c490056211bc38ccc20 (patch) | |
| tree | 3387124478a584b39080e590c7f703b3fc230949 /libavfilter/vf_aspect.c | |
| parent | 976e3439ed992b8e06e3737642448a3935b148e4 (diff) | |
| parent | 9e6b5e61a0c91e25e298d0a21b189c4c95443795 (diff) | |
Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
img2enc: add an option for overwriting one file with subsequent images
Conflicts:
doc/muxers.texi
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_aspect.c')
0 files changed, 0 insertions, 0 deletions