Merge remote-tracking branch 'qatar/master'

* qatar/master: (25 commits)
  riff: fix invalid av_freep() calls on EOF in ff_read_riff_info
  pam: Fix a typo that broke writing and reading PAM files.
  mxfdec: fix memleak on av_realloc failures
  mxfdec: Do not parse slices or DeltaEntryArrays.
  mxfdec: hybrid demuxing/seeking solution
  mxfdec: Add Avid's essence element key.
  mfxdec: Separate mxf_essence_container_uls for audio and video.
  mxfdec: Compute packet offsets properly.
  mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack.
  mxfdec: use av_dlog() for 'no corresponding source package found'
  mxfdec: Make mxf->partitions sorted by offset.
  mxfdec: parse ThisPartition
  mxfdec: Speed up metadata and index parsing.
  mxfdec: Make sure DataDefinition is consistent between material track and source track.
  mxfdec: add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf
  mxfdec: Add hack that adjusts the n_delta calculation when system items are present.
  mxfdec: Parse IndexTableSegments and convert them into AVIndexEntry arrays.
  mxfdec: Move FooterPartition to MXFContext and make sure it is never zero.
  mxfdec: check return value of avio_seek
  mxfdec: skip to end of structural sets
  ...

Conflicts:
	configure
	libavcodec/pnm.c
	libavformat/mxfdec.c
	libavformat/riff.c
	libavformat/rtsp.c

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

diff --cc configure
index 645010b81fc24740f89797ec8fb127e810f20e42,ad7d9d4c5b6549b0a41c28f9a7c288c97dedf2d8..2a3eaa1e942a7cedda6d2181f27fd1f9fb4233bb
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1670,13 -1531,12 +1670,13 @@@ postproc_deps="gpl
  
  # programs
  avconv_deps="avcodec avformat swscale"
 -avplay_deps="avcodec avformat swscale sdl"
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 -avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
 -avserver_extralibs='$ldl'
 -ffmpeg_deps="avcodec avformat swscale"
 +ffplay_deps="avcodec avformat swscale sdl"
 +ffplay_select="buffersink_filter rdft"
 +ffprobe_deps="avcodec avformat"
- ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
++ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
 +ffserver_extralibs='$ldl'
 +ffmpeg_deps="avcodec avformat swscale swresample"
 +ffmpeg_select="buffersink_filter"
  
  doc_deps="texi2html"
  

diff --cc ffserver.c
index c225a94e3b2bdbf47131674c57b5d441af668d14,f3ac319ef93ecfe386e881f41095a947eb2879be..79463c0e64981927c5a6025ea7751bde6fa77f88
--- 1/ffserver.c
--- 2/avserver.c
+++ b/ffserver.c
@@@ -2252,10 -2248,9 +2255,9 @@@ static int http_prepare_data(HTTPContex
  
          /*
           * HACK to avoid mpeg ps muxer to spit many underflow errors
 -         * Default value from Libav
 +         * Default value from FFmpeg
           * Try to set it use configuration option
           */
-         c->fmt_ctx.preload   = (int)(0.5*AV_TIME_BASE);
          c->fmt_ctx.max_delay = (int)(0.7*AV_TIME_BASE);
  
          if (avformat_write_header(&c->fmt_ctx, NULL) < 0) {

diff --cc libavcodec/pnm.c
Simple merge

diff --cc libavformat/mxfdec.c
index e5574e2d184b01daf64b84cf1ac20f0b6288b3a8,4b63b277ffe789197d0d04917f2848185f8fa9e8..036ea94bcdd774bb9f1e12d0349261dc70fde652
--- 1/libavformat/mxfdec.c
--- 2/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@@ -407,10 -407,9 +407,10 @@@ static int mxf_read_primer_pack(void *a
  static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size, UID uid, int64_t klv_offset)
  {
      MXFContext *mxf = arg;
-     MXFPartition *partition;
+     MXFPartition *partition, *tmp_part;
      UID op;
      uint64_t footer_partition;
 +    uint32_t nb_essence_containers;
  
      if (mxf->partitions_count+1 >= UINT_MAX / sizeof(*mxf->partitions))
          return AVERROR(ENOMEM);
@@@ -886,8 -887,10 +889,9 @@@ static int mxf_get_sorted_table_segment
          if (mxf->metadata_sets[i]->type == IndexTableSegment)
              nb_segments++;
  
 -    *sorted_segments  = av_mallocz(nb_segments * sizeof(**sorted_segments));
 -    unsorted_segments = av_mallocz(nb_segments * sizeof(*unsorted_segments));
 -    if (!sorted_segments || !unsorted_segments) {
 +    if (!(unsorted_segments = av_calloc(nb_segments, sizeof(*unsorted_segments))) ||
 +        !(*sorted_segments  = av_calloc(nb_segments, sizeof(**sorted_segments)))) {
+         av_freep(sorted_segments);
          av_free(unsorted_segments);
          return AVERROR(ENOMEM);
      }

diff --cc libavformat/rtsp.c
index 56e5de27f8d821e4dd06216769979996f9edca5c,487e910c17688f4f9453e1be68d8c5158600c787..c2a0d26e5eeefe3e82816c1b45e985fe0f6d599b
--- 1/libavformat/rtsp.c
--- 2/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@@ -1117,10 -1119,14 +1119,10 @@@ int ff_rtsp_make_setup_request(AVFormat
      /* default timeout: 1 minute */
      rt->timeout = 60;
  
--    /* for each stream, make the setup request */
--    /* XXX: we assume the same server is used for the control of each
--     * RTSP stream */
-     port_off = av_get_random_seed() % (RTSP_RTP_PORT_MAX - RTSP_RTP_PORT_MIN);
 -
+     /* Choose a random starting offset within the first half of the
+      * port range, to allow for a number of ports to try even if the offset
+      * happens to be at the end of the random range. */
+     port_off = av_get_random_seed() % ((rt->rtp_port_max - rt->rtp_port_min)/2);
      /* even random offset */
      port_off -= port_off & 0x01;
  

diff --cc libavformat/rtsp.h
Simple merge