Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'

* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
  avformat: av_log_ask_for_sample() ---> avpriv_request_sample()

Conflicts:
	libavformat/mxfdec.c

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

diff --cc libavformat/anm.c
Simple merge

diff --cc libavformat/au.c
Simple merge

diff --cc libavformat/bethsoftvid.c
Simple merge

diff --cc libavformat/filmstripdec.c
Simple merge

diff --cc libavformat/mov.c
Simple merge

diff --cc libavformat/mpegts.c
Simple merge

diff --cc libavformat/mtv.c
Simple merge

diff --cc libavformat/mxfdec.c
index 7dfdbfd,7e3a690..0a81d16
--- 1/libavformat/mxfdec.c
--- 2/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@@ -411,18 -396,15 +411,17 @@@ static int mxf_read_primer_pack(void *a
      int item_len = avio_rb32(pb);
  
      if (item_len != 18) {
-         av_log_ask_for_sample(pb, "unsupported primer pack item length %d\n",
-                               item_len);
+         avpriv_request_sample(pb, "Primer pack item length %d", item_len);
          return AVERROR_PATCHWELCOME;
      }
 -    if (item_num > UINT_MAX / item_len)
 +    if (item_num > 65536) {
 +        av_log(mxf->fc, AV_LOG_ERROR, "item_num %d is too large\n", item_num);
          return AVERROR_INVALIDDATA;
 -    mxf->local_tags_count = item_num;
 -    mxf->local_tags = av_malloc(item_num*item_len);
 +    }
 +    mxf->local_tags = av_calloc(item_num, item_len);
      if (!mxf->local_tags)
          return AVERROR(ENOMEM);
 +    mxf->local_tags_count = item_num;
      avio_read(pb, mxf->local_tags, item_num*item_len);
      return 0;
  }
@@@ -2125,11 -2023,14 +2124,13 @@@ static int mxf_read_packet_old(AVFormat
              next_ofs = mxf_set_current_edit_unit(mxf, klv.offset);
  
              if (next_ofs >= 0 && next_klv > next_ofs) {
 -                /* if this check is hit then it's possible OPAtom was treated
 -                 * as OP1a truncate the packet since it's probably very large
 -                 * (>2 GiB is common) */
 +                /* if this check is hit then it's possible OPAtom was treated as OP1a
 +                 * truncate the packet since it's probably very large (>2 GiB is common) */
-                 av_log_ask_for_sample(s,
-                     "KLV for edit unit %i extends into next edit unit - OPAtom misinterpreted as OP1a?\n",
-                     mxf->current_edit_unit);
+                 avpriv_request_sample(s,
+                                       "OPAtom misinterpreted as OP1a?"
+                                       "KLV for edit unit %i extending into "
+                                       "next edit unit",
+                                       mxf->current_edit_unit);
                  klv.length = next_ofs - avio_tell(s->pb);
              }
  

diff --cc libavformat/omadec.c
Simple merge

diff --cc libavformat/rsodec.c
Simple merge

diff --cc libavformat/rtpdec_latm.c
Simple merge

diff --cc libavformat/rtpdec_qt.c
Simple merge

diff --cc libavformat/smjpegdec.c
Simple merge

diff --cc libavformat/spdifdec.c
Simple merge

diff --cc libavformat/spdifenc.c
Simple merge

diff --cc libavformat/westwood_aud.c
Simple merge

diff --cc libavformat/xmv.c
Simple merge

diff --cc libavformat/xwma.c
Simple merge