generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-05-18 11:04:11 +02:00
commit 0718f0cc24
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/jpeglsdec.c
View File

@ -311,6 +311,10 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
ilv, point_transform, s->bits, s->cur_scan); ilv, point_transform, s->bits, s->cur_scan);
} }
if (ilv == 0) { /* separate planes */ if (ilv == 0) { /* separate planes */
if (s->cur_scan > s->nb_components) {
ret = AVERROR_INVALIDDATA;
goto end;
}
stride = (s->nb_components > 1) ? 3 : 1; stride = (s->nb_components > 1) ? 3 : 1;
off = av_clip(s->cur_scan - 1, 0, stride - 1); off = av_clip(s->cur_scan - 1, 0, stride - 1);
width = s->width * stride; width = s->width * stride;

5
libavfilter/avfilter.h
View File

@ -25,11 +25,11 @@
/** /**
* @file * @file
* @ingroup lavfi * @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 */ #endif /* AVFILTER_AVFILTER_H */

1
libavfilter/version.h
View File

@ -23,6 +23,7 @@
/** /**
* @file * @file
* @ingroup lavfi
* Libavfilter version macros * Libavfilter version macros
*/ */

2
libavutil/avutil.h
View File

@ -35,7 +35,7 @@
* provided by FFmpeg. * provided by FFmpeg.
* *
* @li @ref libavc "libavcodec" encoding/decoding library * @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 libavf "libavformat" I/O and muxing/demuxing library
* @li @ref lavd "libavdevice" special devices muxing/demuxing library * @li @ref lavd "libavdevice" special devices muxing/demuxing library
* @li @ref lavu "libavutil" common utility library * @li @ref lavu "libavutil" common utility library