diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 10:25:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 10:25:32 +0200 |
| commit | 3fa72de82f04802e307085d3fce9eafea1d3dc46 (patch) | |
| tree | 075119600cac0d5d61b710c51a1c669306cc291b /libavutil/avstring.h | |
| parent | 84bc317019ba5c35355592df64d152f2cff76339 (diff) | |
| parent | 56ee3f9de7b9f6090d599a27d33a392890a2f7b8 (diff) | |
| download | ffmpeg-3fa72de82f04802e307085d3fce9eafea1d3dc46.tar.gz | |
Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'
* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8':
avconv: distinguish between -ss 0 and -ss not being used
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/avstring.h')
0 files changed, 0 insertions, 0 deletions