diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 13:35:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 13:35:49 +0100 |
| commit | 5de1f7a7bd8a69d1cbf4f31816f996c99d545a10 (patch) | |
| tree | ac4816768fb314f3dcd844592d2a544a3ad1348c /libavfilter/buffer.c | |
| parent | 9f92e590ba91faa1283b1a9a35dd7e43c5bd998b (diff) | |
| parent | 18e6f087c4a50bede8449ee164778945480be50c (diff) | |
| download | ffmpeg-5de1f7a7bd8a69d1cbf4f31816f996c99d545a10.tar.gz | |
Merge commit '18e6f087c4a50bede8449ee164778945480be50c'
* commit '18e6f087c4a50bede8449ee164778945480be50c':
img2: document the options available
hls: improve options description
hls: use a meaningful long name
hls: add start_number option
h264: check for invalid zeros_left before writing
Conflicts:
doc/demuxers.texi
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffer.c')
0 files changed, 0 insertions, 0 deletions