patched ffmpeg nov 2

patches/to_upstream/11_mkv_buffer_overflow.patch

-diff -rpu -N orig/libavformat/matroskadec.c ffmpeg-mt/libavformat/matroskadec.c
---- orig/libavformat/matroskadec.c      2010-10-11 16:55:30 -0700
-+++ ffmpeg-mt/libavformat/matroskadec.c 2010-10-11 16:55:31 -0700
+diff -wurp -N orig/libavformat/matroskadec.c ffmpeg-mt/libavformat/matroskadec.c
+--- orig/libavformat/matroskadec.c      2010-11-04 08:08:48 -0700
++++ ffmpeg-mt/libavformat/matroskadec.c 2010-11-04 08:08:52 -0700
 @@ -34,13 +34,17 @@
  /* For ff_codec_get_id(). */
  #include "riff.h"
  #include "isom.h"
 +#if CONFIG_SIPR_DECODER
  #include "rm.h"
 +#endif
  #include "matroska.h"
  #include "libavcodec/mpeg4audio.h"
  #include "libavutil/intfloat_readwrite.h"
@@ skipping 47 matching lines @@
          do {
              olen = pkt_size *= 3;
 @@ -930,6 +940,7 @@ static int matroska_decode_buffer(uint8_
              goto failed;
          pkt_size -= olen;
          break;
 +#endif
  #if CONFIG_ZLIB
      case MATROSKA_TRACK_ENCODING_COMP_ZLIB: {
          z_stream zstream = {0};
-@@ -1190,6 +1201,7 @@ static int matroska_read_header(AVFormat
+@@ -1191,6 +1202,7 @@ static int matroska_read_header(AVFormat
          ebml_free(ebml_syntax, &ebml);
          return AVERROR_PATCHWELCOME;
      }
 +    av_metadata_set2(&s->metadata, "doctype", ebml.doctype, 0);
      for (i = 0; i < FF_ARRAY_ELEMS(matroska_doctypes); i++)
          if (!strcmp(ebml.doctype, matroska_doctypes[i]))
              break;
-@@ -1249,14 +1261,17 @@ static int matroska_read_header(AVFormat
+@@ -1250,14 +1262,17 @@ static int matroska_read_header(AVFormat
                     "Multiple combined encodings no supported");
          } else if (encodings_list->nb_elem == 1) {
              if (encodings[0].type ||
 -                (encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP &&
 +                (encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP
  #if CONFIG_ZLIB
 -                 encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB &&
 +                 && encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB
  #endif
  #if CONFIG_BZLIB
 -                 encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB &&
 +                 && encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB
  #endif
 -                 encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO)) {
 +#if HAVE_LZO1X_999_COMPRESS
 +                 && encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO
 +#endif
 +               )) {
                  encodings[0].scope = 0;
                  av_log(matroska->ctx, AV_LOG_ERROR,
                         "Unsupported encoding type");
-@@ -1381,11 +1396,13 @@ static int matroska_read_header(AVFormat
+@@ -1382,11 +1397,13 @@ static int matroska_read_header(AVFormat
                  st->codec->block_align = track->audio.coded_framesize;
                  track->codec_priv.size = 0;
              } else {
 +#if CONFIG_SIPR_DECODER
                  if (codec_id == CODEC_ID_SIPR && flavor < 4) {
                      const int sipr_bit_rate[4] = { 6504, 8496, 5000, 16000 };
                      track->audio.sub_packet_size = ff_sipr_subpk_size[flavor];
                      st->codec->bit_rate = sipr_bit_rate[flavor];
                  }
 +#endif
                  st->codec->block_align = track->audio.sub_packet_size;
                  extradata_offset = 78;
              }
-@@ -1448,6 +1465,8 @@ static int matroska_read_header(AVFormat
+@@ -1449,6 +1466,8 @@ static int matroska_read_header(AVFormat
          } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
              st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
              st->codec->sample_rate = track->audio.out_samplerate;
 +            if (st->codec->sample_rate <= 0)
 +                st->codec->sample_rate = 1;
              st->codec->channels = track->audio.channels;
              if (st->codec->codec_id != CODEC_ID_AAC)
              st->need_parsing = AVSTREAM_PARSE_HEADERS;
-@@ -1727,8 +1746,10 @@ static int matroska_parse_block(Matroska
+@@ -1728,8 +1747,10 @@ static int matroska_parse_block(Matroska
                              memcpy(track->audio.buf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), data+x*sps, sps);
  
                      if (++track->audio.sub_packet_cnt >= h) {
 +#if CONFIG_SIPR_DECODER
                          if (st->codec->codec_id == CODEC_ID_SIPR)
                              ff_rm_reorder_sipr_data(track->audio.buf, h, w);
 +#endif
                          track->audio.sub_packet_cnt = 0;
                          track->audio.pkt_cnt = h*w / a;
                      }