aboutsummaryrefslogtreecommitdiffstats
path: root/cmdutils.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-18 23:12:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-18 23:39:42 +0100
commitbae053fca4cf662a223821f1e1fe43236e1cf2ff (patch)
tree0a3c448cd41c5beaaae48a6a61430c9d6277bb7f /cmdutils.h
parent7f4c5ab8a1cc5e7be8ce70edfcaa6f926791376b (diff)
parenta56fba502e9087c204b7d6cdc8e12d623f77d66d (diff)
downloadffmpeg-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.h')
-rw-r--r--cmdutils.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.h b/cmdutils.h
index 26cd96a131..ad74213027 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -357,7 +357,7 @@ int cmdutils_read_file(const char *filename, char **bufptr, size_t *size);
* at configuration time or in a "ffpresets" folder along the executable
* on win32, in that order. If no such file is found and
* codec_name is defined, then search for a file named
- * codec_name-preset_name.ffpreset in the above-mentioned directories.
+ * codec_name-preset_name.avpreset in the above-mentioned directories.
*
* @param filename buffer where the name of the found filename is written
* @param filename_size size in bytes of the filename buffer