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 | |
| 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>
| -rw-r--r-- | libavcodec/jpeglsdec.c | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 5 | ||||
| -rw-r--r-- | libavfilter/version.h | 1 | ||||
| -rw-r--r-- | libavutil/avutil.h | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index c133cfb207..3af230d1db 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -311,6 +311,10 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, ilv, point_transform, s->bits, s->cur_scan); } if (ilv == 0) { /* separate planes */ + if (s->cur_scan > s->nb_components) { + ret = AVERROR_INVALIDDATA; + goto end; + } stride = (s->nb_components > 1) ? 3 : 1; off = av_clip(s->cur_scan - 1, 0, stride - 1); width = s->width * stride; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 822eca7af2..741ec350b8 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -25,11 +25,11 @@ /** * @file * @ingroup lavfi - * external API header + * Main libavfilter public API header */ /** - * @defgroup lavfi Libavfilter + * @defgroup lavfi Libavfilter - graph-based frame editing library * @{ */ @@ -1298,4 +1298,5 @@ int avfilter_graph_request_oldest(AVFilterGraph *graph); /** * @} */ + #endif /* AVFILTER_AVFILTER_H */ 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 */ 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 |