From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 19 Sep 2011 20:45:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a6186f3a0006d43950aaa5416b7e71c4b82f49f5;p=ffmpeg

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: fix NULL reference in mov_write_tkhd_tag
  rmdec: Reject invalid deinterleaving parameters
  rv34: Fix potential overreads
  rv34: Fix buffer size used for MC of B frames after a resolution change
  rv34: Avoid NULL dereference on corrupted bitstream
  rv10: Reject slices that does not have the same type as the first one
  vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag
  vsrc_color: set output pos values to -1
  vsrc_color: add @file doxy
  vsrc_buffer: remove duplicated file description
  eval: implement not() expression
  eval: add sqrt function for computing the square root
  rmdec: use the deinterleaving mode and not the codec when creating audio packets.
  lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails

Conflicts:
	doc/eval.texi
	doc/filters.texi
	libavcodec/rv10.c
	libavfilter/vsrc_color.c
	libavformat/rmdec.c
	libavutil/avutil.h
	libavutil/eval.c
	tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

a6186f3a0006d43950aaa5416b7e71c4b82f49f5
diff --cc libavcodec/rv10.c
index 18a79afbee2,3ba8102b50d..20e2829e321
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@@ -548,11 -532,12 +548,13 @@@ static int rv10_decode_packet(AVCodecCo
              return -1;
          ff_er_frame_start(s);
      } else {
-         if (s->current_picture_ptr->f.pict_type != s->pict_type)
+         if (s->current_picture_ptr->f.pict_type != s->pict_type) {
+             av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
              return -1;
+         }
      }
  
 +
      av_dlog(avctx, "qscale=%d\n", s->qscale);
  
      /* default quantization values */
diff --cc libavformat/rmdec.c
index 4d1e75aa40a,56ad3313cfc..131345cdc4e
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@@ -252,14 -232,6 +232,7 @@@ static int rm_read_audio_stream_info(AV
              }
              if ((ret = rm_read_extradata(pb, st->codec, codecdata_length)) < 0)
                  return ret;
 +
-             if (ast->audio_framesize <= 0 || sub_packet_h <= 0 ||
-                 ast->audio_framesize >= UINT_MAX / sub_packet_h){
-                 av_log(s, AV_LOG_ERROR, "rm->audio_framesize * sub_packet_h is invalid\n");
-                 return -1;
-             }
- 
-             av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h);
              break;
          case CODEC_ID_AAC:
              avio_rb16(pb); avio_r8(pb);
diff --cc libavutil/avutil.h
index ef7a1459dc0,5d378ce3a91..9282e5b8979
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@@ -40,8 -40,8 +40,8 @@@
  #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
  
  #define LIBAVUTIL_VERSION_MAJOR 51
 -#define LIBAVUTIL_VERSION_MINOR 10
 -#define LIBAVUTIL_VERSION_MICRO  2
 +#define LIBAVUTIL_VERSION_MINOR 16
- #define LIBAVUTIL_VERSION_MICRO  0
++#define LIBAVUTIL_VERSION_MICRO  1
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \