diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 11:04:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 11:04:11 +0200 |
| commit | 0718f0cc24bc8413cd0cf44fcf000f0e52a67522 (patch) | |
| tree | dc51169ff43d27c18b9e87faf49d7ced1149a8ba /libavutil/avutil.h | |
| parent | 7d84bb2bcca85c37dc2252f0dc5d585ee9c0011f (diff) | |
| parent | bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec (diff) | |
| download | ffmpeg-0718f0cc24bc8413cd0cf44fcf000f0e52a67522.tar.gz | |
Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'
* commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec':
lavfi doxy: add a page for lavfi.
jpegls: check the scan offset
Conflicts:
libavcodec/jpeglsdec.c
libavfilter/avfilter.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/avutil.h')
| -rw-r--r-- | libavutil/avutil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 6f307d6c5d..dc8a03f29a 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -35,7 +35,7 @@ * provided by FFmpeg. * * @li @ref libavc "libavcodec" encoding/decoding library - * @li @ref lavfi "libavfilter" graph based frame editing library + * @li @ref lavfi "libavfilter" graph-based frame editing library * @li @ref libavf "libavformat" I/O and muxing/demuxing library * @li @ref lavd "libavdevice" special devices muxing/demuxing library * @li @ref lavu "libavutil" common utility library |