Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:04:11 +0000 (11:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:04:11 +0000 (11:04 +0200)
* 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>
1  2 
libavcodec/jpeglsdec.c
libavfilter/avfilter.h
libavfilter/version.h
libavutil/avutil.h

@@@ -300,19 -297,21 +300,23 @@@ int ff_jpegls_decode_picture(MJpegDecod
      else
          shift = point_transform + (16 - s->bits);
  
 -    av_dlog(s->avctx,
 -            "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) "
 -            "RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
 -            s->width, s->height, state->near, state->maxval,
 -            state->T1, state->T2, state->T3,
 -            state->reset, state->limit, state->qbpp, state->range);
 -    av_dlog(s->avctx, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n",
 -            ilv, point_transform, s->bits, s->cur_scan);
 +    if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
 +        av_log(s->avctx, AV_LOG_DEBUG,
 +               "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) "
 +               "RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
 +                s->width, s->height, state->near, state->maxval,
 +                state->T1, state->T2, state->T3,
 +                state->reset, state->limit, state->qbpp, state->range);
 +        av_log(s->avctx, AV_LOG_DEBUG, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n",
 +                ilv, point_transform, s->bits, s->cur_scan);
 +    }
      if (ilv == 0) { /* separate planes */
 -        off    = s->cur_scan - 1;
+         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;
          cur   += off;
          for (i = 0; i < s->height; i++) {
Simple merge
Simple merge
  /**
   * @mainpage
   *
 - * @section libav_intro Introduction
 + * @section ffmpeg_intro Introduction
   *
   * This document describes the usage of the different libraries
 - * provided by Libav.
 + * 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