diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-18 23:12:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-18 23:39:42 +0100 |
| commit | bae053fca4cf662a223821f1e1fe43236e1cf2ff (patch) | |
| tree | 0a3c448cd41c5beaaae48a6a61430c9d6277bb7f /cmdutils.c | |
| parent | 7f4c5ab8a1cc5e7be8ce70edfcaa6f926791376b (diff) | |
| parent | a56fba502e9087c204b7d6cdc8e12d623f77d66d (diff) | |
| download | ffmpeg-bae053fca4cf662a223821f1e1fe43236e1cf2ff.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: make compare() function compatible with POSIX bc
Update Janne's email address.
APIchanges: Replace Subversion revision numbers by Git hashes.
bytestream: Eliminate one level of pointless macro indirection.
xwd: convert to bytestream2.
vqavideo: port to bytestream2 API
Read preset files with suffix .avpreset
prores: allow user to set fixed quantiser
lavf: remove some disabled code.
lavf: only set average frame rate for video.
lavf: remove a pointless check.
avcodec: add XBM encoder
Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vqavideo.c
libavformat/img2enc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 02113518ee..58f08f6b3b 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1064,7 +1064,7 @@ FILE *get_preset_file(char *filename, size_t filename_size, if (!f && codec_name) { snprintf(filename, filename_size, "%s%s/%s-%s.ffpreset", - base[i], i != 1 ? "" : "/.ffmpeg", codec_name, + base[i], i != 1 ? "" : "/.ffmpeg", codec_name, preset_name); f = fopen(filename, "r"); } |