Merge remote-tracking branch 'qatar/master'

* qatar/master: (25 commits)
  rtpenc: Add support for G726 audio
  rtpdec: Interpret the different G726 names as bits_per_coded_sample
  rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes
  rtpenc: Cast a rescaling parameter to int64_t
  h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
  ARM: fix indentation in ff_dsputil_init_neon()
  ARM: NEON put/avg_pixels8/16 cosmetics
  ARM: add remaining NEON avg_pixels8/16 functions
  ARM: clean up NEON put/avg_pixels macros
  fate: split acodec-pcm into individual tests
  swscale: #include "libavutil/mathematics.h"
  pmpdec: don't use deprecated av_set_pts_info.
  rv34: align temporary block of "dct" coefs
  Add PlayStation Portable PMP format demuxer
  proto: Realign struct initializers
  proto: Use .priv_data_size to allocate the private context
  mmsh: Properly clean up if the second ffurl_alloc failed
  rtmp: Clean up properly if the handshake failed
  md5proto: Remove the get_file_handle function
  applehttpproto: Use the close function if the open function fails
  ...

Conflicts:
	libavcodec/vble.c
	libavformat/mmsh.c
	libavformat/pmpdec.c
	libavformat/udp.c
	tests/ref/acodec/pcm

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

diff --cc Changelog
index e64dca688b607972cc8bb5319e0afd90b1ed9642,ff37020bdbf361103c98a7a8d2d53a9be0aa2622..3b12e2ae974f09bb85365a853103440bbe86dbe5
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -121,17 -102,36 +121,18 @@@ easier to use. The changes are
  - Discworld II BMV decoding support
  - VBLE Decoder
  - OS X Video Decoder Acceleration (VDA) support
 +- compact and csv output in ffprobe
 +- pan audio filter
 +- IFF Amiga Continuous Bitmap (ACBM) decoder
 +- ass filter
  - CRI ADX audio format demuxer
+ - Playstation Portable PMP format demuxer
  
  
 -version 0.7:
 -
 -- E-AC-3 audio encoder
 -- ac3enc: add channel coupling support
 -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 -- H.264/MPEG frame-level multithreading
 -- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 -- 4:4:4 H.264 decoding support
 -- 10-bit H.264 optimizations for x86
 -- bump libswscale for recently reported ABI break
 -
 -
 -version 0.7_beta2:
 +version 0.8:
  
 -- VP8 frame-level multithreading
 -- NEON optimizations for VP8
 -- removed a lot of deprecated API cruft
 -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 -- DPX image encoder
 -- SMPTE 302M AES3 audio decoder
 -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead
 -- 9bit and 10bit per sample support in the H.264 decoder
 -
 -
 -version 0.7_beta1:
  
 +- many many things we forgot because we rather write code than changelogs
  - WebM support in Matroska de/muxer
  - low overhead Ogg muxing
  - MMS-TCP support

diff --cc libavcodec/arm/dsputil_init_neon.c
Simple merge

diff --cc libavcodec/arm/dsputil_neon.S
Simple merge

diff --cc libavcodec/h264.c
Simple merge

diff --cc libavcodec/rv34.c
Simple merge

diff --cc libavformat/applehttpproto.c
Simple merge

diff --cc libavformat/cache.c
index c2bddf5f6d5a826784788a6c9358d68e7e87519a,0000000000000000000000000000000000000000..d94cf5fbaca071262d0bf02a0b181e14b38404e1
mode 100644,000000..100644
--- 1/libavformat/cache.c
--- /dev/null
+++ b/libavformat/cache.c
@@@ -1,144 -1,0 +1,137 @@@
-     Context *c;
- 
-     c = av_mallocz(sizeof(Context));
-     if (!c) {
-         return AVERROR(ENOMEM);
-     }
-     h->priv_data = c;
 +/*
 + * Input cache protocol.
 + * Copyright (c) 2011 Michael Niedermayer
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + *
 + * Based on file.c by Fabrice Bellard
 + */
 +
 +/**
 + * @TODO
 + *      support non continuous caching
 + *      support keeping files
 + *      support filling with a background thread
 + */
 +
 +#include "libavutil/avassert.h"
 +#include "libavutil/avstring.h"
 +#include "libavutil/file.h"
 +#include "avformat.h"
 +#include <fcntl.h>
 +#if HAVE_SETMODE
 +#include <io.h>
 +#endif
 +#include <unistd.h>
 +#include <sys/stat.h>
 +#include <stdlib.h>
 +#include "os_support.h"
 +#include "url.h"
 +
 +typedef struct Context {
 +    int fd;
 +    int64_t end;
 +    int64_t pos;
 +    URLContext *inner;
 +} Context;
 +
 +static int cache_open(URLContext *h, const char *arg, int flags)
 +{
 +    int access;
 +    const char *buffername;
-     av_freep(&h->priv_data);
- 
++    Context *c= h->priv_data;
 +
 +    av_strstart(arg, "cache:", &arg);
 +
 +    c->fd = av_tempfile("ffcache", &buffername, 0, h);
 +    if (c->fd < 0){
 +        av_log(h, AV_LOG_ERROR, "Failed to create tempfile\n");
 +        return c->fd;
 +    }
 +
 +    unlink(buffername);
 +    av_free(buffername);
 +
 +    return ffurl_open(&c->inner, arg, flags, &h->interrupt_callback, NULL);
 +}
 +
 +static int cache_read(URLContext *h, unsigned char *buf, int size)
 +{
 +    Context *c= h->priv_data;
 +    int r;
 +
 +    if(c->pos<c->end){
 +        r = read(c->fd, buf, FFMIN(size, c->end - c->pos));
 +        if(r>0)
 +            c->pos += r;
 +        return (-1 == r)?AVERROR(errno):r;
 +    }else{
 +        r = ffurl_read(c->inner, buf, size);
 +        if(r > 0){
 +            int r2= write(c->fd, buf, r);
 +            av_assert0(r2==r); // FIXME handle cache failure
 +            c->pos += r;
 +            c->end += r;
 +        }
 +        return r;
 +    }
 +}
 +
 +static int64_t cache_seek(URLContext *h, int64_t pos, int whence)
 +{
 +    Context *c= h->priv_data;
 +
 +    if (whence == AVSEEK_SIZE) {
 +        pos= ffurl_seek(c->inner, pos, whence);
 +        if(pos <= 0){
 +            pos= ffurl_seek(c->inner, -1, SEEK_END);
 +            ffurl_seek(c->inner, c->end, SEEK_SET);
 +            if(pos <= 0)
 +                return c->end;
 +        }
 +        return pos;
 +    }
 +
 +    pos= lseek(c->fd, pos, whence);
 +    if(pos<0){
 +        return pos;
 +    }else if(pos <= c->end){
 +        c->pos= pos;
 +        return pos;
 +    }else{
 +        lseek(c->fd, c->pos, SEEK_SET);
 +        return AVERROR(EPIPE);
 +    }
 +}
 +
 +static int cache_close(URLContext *h)
 +{
 +    Context *c= h->priv_data;
 +    close(c->fd);
 +    ffurl_close(c->inner);
 +
 +    return 0;
 +}
 +
 +URLProtocol ff_cache_protocol = {
 +    .name                = "cache",
 +    .url_open            = cache_open,
 +    .url_read            = cache_read,
 +    .url_seek            = cache_seek,
 +    .url_close           = cache_close,
++    .priv_data_size      = sizeof(Context),
 +};

diff --cc libavformat/concat.c
Simple merge

diff --cc libavformat/gopher.c
Simple merge

diff --cc libavformat/http.c
Simple merge

diff --cc libavformat/librtmp.c
Simple merge

diff --cc libavformat/md5proto.c
Simple merge

diff --cc libavformat/mmsh.c
index bc93722f1a02ee215d10d64bd307431ab00a3701,fa1a467223d0cc26f5dc1746a8307bd593c3444c..e92b74fc0a5670db3800deea48ce093aad7bf1fa
--- 1/libavformat/mmsh.c
--- 2/libavformat/mmsh.c
+++ b/libavformat/mmsh.c
@@@ -212,24 -210,21 +211,21 @@@ static int get_http_header_data(MMSHCon
      }
  }
  
 -static int mmsh_open(URLContext *h, const char *uri, int flags)
 +static int mmsh_open_internal(URLContext *h, const char *uri, int flags, int timestamp, int64_t pos)
  {
      int i, port, err;
 -    char httpname[256], path[256], host[128], location[1024];
 +    char httpname[256], path[256], host[128];
      char *stream_selection = NULL;
      char headers[1024];
-     MMSHContext *mmsh;
+     MMSHContext *mmsh = h->priv_data;
      MMSContext *mms;
  
-     mmsh = h->priv_data = av_mallocz(sizeof(MMSHContext));
-     if (!h->priv_data)
-         return AVERROR(ENOMEM);
      mmsh->request_seq = h->is_streamed = 1;
      mms = &mmsh->mms;
 -    av_strlcpy(location, uri, sizeof(location));
 +    av_strlcpy(mmsh->location, uri, sizeof(mmsh->location));
  
      av_url_split(NULL, 0, NULL, 0,
 -        host, sizeof(host), &port, path, sizeof(path), location);
 +        host, sizeof(host), &port, path, sizeof(path), mmsh->location);
      if (port<0)
          port = 80; // default mmsh protocol port
      ff_url_join(httpname, sizeof(httpname), "http", NULL, host, port, "%s", path);
@@@ -369,44 -358,10 +365,45 @@@ static int mmsh_read(URLContext *h, uin
      return res;
  }
  
 +static int64_t mmsh_read_seek(URLContext *h, int stream_index,
 +                        int64_t timestamp, int flags)
 +{
 +    MMSHContext *mmsh = h->priv_data;
 +    MMSContext *mms   = &mmsh->mms;
 +    int ret;
 +
 +    ret= mmsh_open_internal(h, mmsh->location, 0, FFMAX(timestamp, 0), 0);
 +
 +    if(ret>=0){
 +        if (mms->mms_hd)
 +            ffurl_close(mms->mms_hd);
 +        av_freep(&mms->streams);
 +        av_freep(&mms->asf_header);
 +        av_free(mmsh);
 +        mmsh = h->priv_data;
 +        mms   = &mmsh->mms;
 +        mms->asf_header_read_size= mms->asf_header_size;
 +    }else
 +        h->priv_data= mmsh;
 +    return ret;
 +}
 +
 +static int64_t mmsh_seek(URLContext *h, int64_t pos, int whence)
 +{
 +    MMSHContext *mmsh = h->priv_data;
 +    MMSContext *mms   = &mmsh->mms;
 +
 +    if(pos == 0 && whence == SEEK_CUR)
 +        return mms->asf_header_read_size + mms->remaining_in_len + mmsh->chunk_seq * mms->asf_packet_len;
 +    return AVERROR(ENOSYS);
 +}
 +
  URLProtocol ff_mmsh_protocol = {
-     .name      = "mmsh",
-     .url_open  = mmsh_open,
-     .url_read  = mmsh_read,
-     .url_seek  = mmsh_seek,
-     .url_close = mmsh_close,
+     .name           = "mmsh",
+     .url_open       = mmsh_open,
+     .url_read       = mmsh_read,
++    .url_seek       = mmsh_seek,
+     .url_close      = mmsh_close,
 +    .url_read_seek  = mmsh_read_seek,
+     .priv_data_size = sizeof(MMSHContext),
  };

diff --cc libavformat/mmst.c
Simple merge

diff --cc libavformat/pmpdec.c
index 88b8998ad914e582d1c92b7415692c10b79ac7e4,96c704857066915bf4adb7da59bfb7fa3583e6fa..3d54484314fafcf3c5f6ce5b75f2666747c8d996
--- 1/libavformat/pmpdec.c
--- 2/libavformat/pmpdec.c
+++ b/libavformat/pmpdec.c
@@@ -93,16 -95,15 +94,15 @@@ static int pmp_header(AVFormatContext *
          AVStream *ast = avformat_new_stream(s, NULL);
          if (!ast)
              return AVERROR(ENOMEM);
-         ast->id = i;
 -        ast->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
 -        ast->codec->codec_id    = audio_codec_id;
 -        ast->codec->channels    = channels;
 +        ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
 +        ast->codec->codec_id = audio_codec_id;
 +        ast->codec->channels = channels;
          ast->codec->sample_rate = srate;
 -        avpriv_set_pts_info(ast, 32, 1, srate);
 +        av_set_pts_info(ast, 32, 1, srate);
      }
 -    pos = avio_tell(pb) + 4 * index_cnt;
 +    pos = avio_tell(pb) + 4*index_cnt;
      for (i = 0; i < index_cnt; i++) {
 -        int size  = avio_rl32(pb);
 +        int size = avio_rl32(pb);
          int flags = size & 1 ? AVINDEX_KEYFRAME : 0;
          size >>= 1;
          av_add_index_entry(vst, pos, i, size, 0, flags);
@@@ -132,10 -138,10 +137,10 @@@ static int pmp_packet(AVFormatContext *
              pmp->packet_sizes[i] = avio_rl32(pb);
      }
      ret = av_get_packet(pb, pkt, pmp->packet_sizes[pmp->current_packet]);
 -    if (ret > 0) {
 +    if (ret >= 0) {
          ret = 0;
-         // FIXME: this is a hack that should be remove once
-         // compute_pkt_fields can handle
+         // FIXME: this is a hack that should be removed once
+         // compute_pkt_fields() can handle timestamps properly
          if (pmp->cur_stream == 0)
              pkt->dts = s->streams[0]->cur_dts++;
          pkt->stream_index = pmp->cur_stream;
@@@ -146,8 -153,8 +151,8 @@@
      return ret;
  }
  
- static int pmp_seek(AVFormatContext *s, int stream_index,
-                      int64_t ts, int flags) {
 -static int pmp_seek(AVFormatContext *s, int stream_idx, int64_t ts, int flags)
++static int pmp_seek(AVFormatContext *s, int stream_index, int64_t ts, int flags)
+ {
      PMPContext *pmp = s->priv_data;
      pmp->cur_stream = 0;
      // fallback to default seek now

diff --cc libavformat/rtmpproto.c
Simple merge

diff --cc libavformat/rtpdec_g726.c
Simple merge

diff --cc libavformat/rtpenc.c
Simple merge

diff --cc libavformat/rtpproto.c
Simple merge

diff --cc libavformat/sdp.c
Simple merge

diff --cc libavformat/tcp.c
Simple merge

diff --cc libavformat/udp.c
index ee5b3047699dff1f061741aa991e543dc21dc8f3,529114a860c3f5b1ad5b817b4a927204a47335f7..a0d127c614bc75e9740e7912413d54394cca815f
--- 1/libavformat/udp.c
--- 2/libavformat/udp.c
+++ b/libavformat/udp.c
@@@ -532,8 -435,6 +527,7 @@@ static int udp_open(URLContext *h, cons
   fail:
      if (udp_fd >= 0)
          closesocket(udp_fd);
-     av_free(s);
 +    av_fifo_free(s->fifo);
      return AVERROR(EIO);
  }
  
@@@ -613,8 -480,6 +607,7 @@@ static int udp_close(URLContext *h
      if (s->is_multicast && (h->flags & AVIO_FLAG_READ))
          udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr);
      closesocket(s->udp_fd);
-     av_free(s);
 +    av_fifo_free(s->fifo);
      return 0;
  }
  

diff --cc libswscale/utils.c
index e27144e594ba923907a2a7da87d1001a87781e5f,b644ed9610fa798429e8f185d82d17a47bb1391d..3240b9603070d016b450dac2a1690e793c4af5c0
--- 1/libswscale/utils.c
--- 2/libswscale/utils.c
+++ b/libswscale/utils.c
@@@ -44,9 -43,9 +44,10 @@@
  #include "libavutil/cpu.h"
  #include "libavutil/avutil.h"
  #include "libavutil/bswap.h"
+ #include "libavutil/mathematics.h"
  #include "libavutil/opt.h"
  #include "libavutil/pixdesc.h"
 +#include "libavutil/avassert.h"
  
  unsigned swscale_version(void)
  {

diff --cc tests/codec-regression.sh
Simple merge

diff --cc tests/ref/acodec/pcm_s16be
index 0000000000000000000000000000000000000000,708375d6571624612f29abc219c277db864335ea..53c4b4370412d50db4962842286bcb387d473bff
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/acodec/pcm_s16be
+++ b/tests/ref/acodec/pcm_s16be
@@@ -1,0 -1,4 +1,4 @@@
 -a4e18d1ca9ef5b8132a84d43625ddc47 *./tests/data/acodec/pcm_s16be.mov
 -1060037 ./tests/data/acodec/pcm_s16be.mov
++9686b93d1439fc2df991a004ab0298f4 *./tests/data/acodec/pcm_s16be.mov
++1058993 ./tests/data/acodec/pcm_s16be.mov
+ 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s16be.acodec.out.wav
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400

diff --cc tests/ref/acodec/pcm_s24be
index 0000000000000000000000000000000000000000,1e90d7e008ada951bd1308ebb5d44a9b1abb3139..743183e33765848590338b952a2e665baae28a62
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/acodec/pcm_s24be
+++ b/tests/ref/acodec/pcm_s24be
@@@ -1,0 -1,4 +1,4 @@@
 -971d2d2633e41a0326fe2d04a2d0350f *./tests/data/acodec/pcm_s24be.mov
 -1589237 ./tests/data/acodec/pcm_s24be.mov
++22c5c3df0a4765e28c205a4fb95b3cdc *./tests/data/acodec/pcm_s24be.mov
++1588193 ./tests/data/acodec/pcm_s24be.mov
+ 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s24be.acodec.out.wav
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400

diff --cc tests/ref/acodec/pcm_s24daud
index 0000000000000000000000000000000000000000,eab6f8d28e50d613c2eb1a6c6a8b82b557bddc73..62c44219082894e10c30d72c8b972fbda9031aae
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/acodec/pcm_s24daud
+++ b/tests/ref/acodec/pcm_s24daud
@@@ -1,0 -1,4 +1,4 @@@
 -8168a5c1343553ef027541830f2cb879 *./tests/data/acodec/pcm_s24daud.302
++1b75d5198ae789ab3c48f7024e08f4a9 *./tests/data/acodec/pcm_s24daud.302
+ 10368730 ./tests/data/acodec/pcm_s24daud.302
 -f552afadfdfcd6348a07095da6382de5 *./tests/data/pcm_s24daud.acodec.out.wav
 -stddev: 9416.28 PSNR: 16.85 MAXDIFF:42744 bytes:  6911796/  1058400
++4708f86529c594e29404603c64bb208c *./tests/data/pcm_s24daud.acodec.out.wav
++stddev: 8967.92 PSNR: 17.28 MAXDIFF:42548 bytes:  6911796/  1058400

diff --cc tests/ref/acodec/pcm_s32be
index 0000000000000000000000000000000000000000,3bbb71df28abe58b68ba68f5c7c22a13ffeef29d..e2fbd3ba5a6822ddd0936f19860f8615f9328a78
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/acodec/pcm_s32be
+++ b/tests/ref/acodec/pcm_s32be
@@@ -1,0 -1,4 +1,4 @@@
 -fc4f4e3e195bbde037ed31021d229f12 *./tests/data/acodec/pcm_s32be.mov
 -2118437 ./tests/data/acodec/pcm_s32be.mov
++b36ac7a1b4fc28248a565a676e555bd1 *./tests/data/acodec/pcm_s32be.mov
++2117393 ./tests/data/acodec/pcm_s32be.mov
+ 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s32be.acodec.out.wav
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400

diff --cc tests/ref/acodec/pcm_s8
index 0000000000000000000000000000000000000000,7a53fdc5c5a46f225c1a7ce825c2694a98e6c5b0..34e5149f782f37c60d8f7c3d26320129332c8f7e
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/acodec/pcm_s8
+++ b/tests/ref/acodec/pcm_s8
@@@ -1,0 -1,4 +1,4 @@@
 -760f85fb9f4e8aba326fb44ae84c9507 *./tests/data/acodec/pcm_s8.mov
 -530837 ./tests/data/acodec/pcm_s8.mov
++b78d2a30df75af08ecf86f201281fec2 *./tests/data/acodec/pcm_s8.mov
++529793 ./tests/data/acodec/pcm_s8.mov
+ 651d4eb8d98dfcdda96ae6c43d8f156b *./tests/data/pcm_s8.acodec.out.wav
+ stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400