diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:49:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:49:47 +0200 |
| commit | 99091ff217440daa33fddcf66170e1a6d630c3a4 (patch) | |
| tree | 8146302a4c2f83b05eb2ecc2a99ec131360e2feb /libswresample/resample_template.c | |
| parent | 5993b962691ae29b6563785d26ef2a19ffa97f4c (diff) | |
| parent | 205a4502d3da9de2db75d2c965c9d065574e9266 (diff) | |
| download | ffmpeg-99091ff217440daa33fddcf66170e1a6d630c3a4.tar.gz | |
Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
doc: Clarify the avconv section about -re
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample_template.c')
0 files changed, 0 insertions, 0 deletions