diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 13:04:11 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 13:04:11 +0400 |
| commit | 0718f0cc24bc8413cd0cf44fcf000f0e52a67522 (patch) | |
| tree | dc51169ff43d27c18b9e87faf49d7ced1149a8ba /libavfilter/version.h | |
| parent | 7d84bb2bcca85c37dc2252f0dc5d585ee9c0011f (diff) | |
| parent | bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec (diff) | |
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 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 19e2389db2..22d45892ab 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -23,6 +23,7 @@ /** * @file + * @ingroup lavfi * Libavfilter version macros */ |