diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:38:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:38:02 +0100 |
| commit | af4b1c02acf6923489d30349c4813a0d73b2f114 (patch) | |
| tree | 72ba1faae0a32c3850d8a15fc07f282fec06c33c /cmdutils_common_opts.h | |
| parent | 52b866471ec97dd03d92ad1df4c5bdba54f285c0 (diff) | |
| parent | 77bd1bc73a1946b0f0ce09a7cbb242a65e138d06 (diff) | |
| download | ffmpeg-af4b1c02acf6923489d30349c4813a0d73b2f114.tar.gz | |
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_common_opts.h')
0 files changed, 0 insertions, 0 deletions