Merge remote-tracking branch 'qatar/master'

* qatar/master: (42 commits)
  swscale: fix signed overflow in yuv2mono_X_c_template
  snow: fix integer overflows
  svq1enc: remove stale altivec-related hack
  snow: fix signed overflow in byte to 32-bit replication
  adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
  avformat: add CRI ADX format demuxer
  adx: add an ADX parser.
  adx: move header decoding to ADX common code
  adx: calculate the number of blocks in a packet
  adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
  adx: check for unsupported ADX formats
  adx: simplify encoding by using put_sbits()
  adx: calculate correct LPC coeffs
  adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
  adx: simplify adx_decode() by using get_sbits() to read residual samples
  adx: fix the data offset parsing in adx_decode_header()
  adx: remove unneeded post-decode channel interleaving
  adx: validate header values
  adx: cosmetics: general pretty-printing and comment clean-up
  adx: remove useless comments
  ...

Conflicts:
	Changelog
	libavcodec/cook.c
	libavcodec/fraps.c
	libavcodec/nuv.c
	libavcodec/pthread.c
	libavcodec/version.h
	libavformat/Makefile
	libavformat/version.h

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

diff --cc Changelog
index 69ed8cccbb94d530b353019a2dc1bdb96a447ae5,e5c4993dbe064d7e7d3ad2985ddbdbde39a31d53..e64dca688b607972cc8bb5319e0afd90b1ed9642
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -121,16 -102,35 +121,17 @@@ 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
  
  
 -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.8:
  
  
 -version 0.7_beta2:
 -
 -- 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 doc/general.texi
Simple merge

diff --cc libavcodec/Makefile
index 07f7739738d4321c94330ed6bc2bfac546492724,a78cd8171ea34e7a2192e8473330eca09dfb4460..77662d8f0b1568b193dc075d3c5c5014cae26d44
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -558,11 -528,12 +558,12 @@@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER
  
  # libavformat dependencies
  OBJS-$(CONFIG_ADTS_MUXER)              += mpeg4audio.o
+ OBJS-$(CONFIG_ADX_DEMUXER)             += adx.o
  OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_DV_DEMUXER)              += dvdata.o
 -OBJS-$(CONFIG_DV_MUXER)                += dvdata.o
 -OBJS-$(CONFIG_FLAC_DEMUXER)            += flacdec.o flacdata.o flac.o
 -OBJS-$(CONFIG_FLAC_MUXER)              += flacdec.o flacdata.o flac.o
 +OBJS-$(CONFIG_DV_MUXER)                += dvdata.o timecode.o
 +OBJS-$(CONFIG_FLAC_DEMUXER)            += flacdec.o flacdata.o flac.o vorbis_data.o
 +OBJS-$(CONFIG_FLAC_MUXER)              += flacdec.o flacdata.o flac.o vorbis_data.o
  OBJS-$(CONFIG_FLV_DEMUXER)             += mpeg4audio.o
  OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.o
  OBJS-$(CONFIG_IFF_DEMUXER)             += iff.o

diff --cc libavcodec/adx.h
Simple merge

diff --cc libavcodec/adxdec.c
Simple merge

diff --cc libavcodec/adxenc.c
Simple merge

diff --cc libavcodec/allcodecs.c
Simple merge

diff --cc libavcodec/apedec.c
Simple merge

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/cook.c
Simple merge

diff --cc libavcodec/dnxhdenc.c
Simple merge

diff --cc libavcodec/dv.c
Simple merge

diff --cc libavcodec/fraps.c
Simple merge

diff --cc libavcodec/gifdec.c
Simple merge

diff --cc libavcodec/nuv.c
index b10b8db248eabbb02faed92eb99054c361eb3571,94962b58436dd12376ca28606ee220b2f063af7c..7f8dc7501b4386a71d0ff3e5c40096e6b01808e5
--- 1/libavcodec/nuv.c
--- 2/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@@ -187,13 -180,13 +187,13 @@@ retry
          if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen))
              av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
          buf = c->decomp_buf;
 -        buf_size = c->decomp_size;
 +        buf_size = c->decomp_size - AV_LZO_OUTPUT_PADDING - outlen;
      }
      if (c->codec_frameheader) {
 -        int w, h, q;
 +        int w, h, q, res;
          if (buf[0] != 'V' || buf_size < 12) {
              av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame (wrong codec_tag?)\n");
-             return -1;
+             return AVERROR_INVALIDDATA;
          }
          w = AV_RL16(&buf[6]);
          h = AV_RL16(&buf[8]);

diff --cc libavcodec/pthread.c
Simple merge

diff --cc libavcodec/qtrle.c
Simple merge

diff --cc libavcodec/rv34.c
Simple merge

diff --cc libavcodec/s3tc.c
Simple merge

diff --cc libavcodec/snow.c
Simple merge

diff --cc libavcodec/snow.h
Simple merge

diff --cc libavcodec/snowenc.c
Simple merge

diff --cc libavcodec/svq1dec.c
Simple merge

diff --cc libavcodec/svq1enc.c
Simple merge

diff --cc libavcodec/version.h
index 98eb48086c4066ef632ac6550f1080314a806bd0,0bd17817ecf7cf376badb65ddaae46e7c8064fc5..31145db362d564e9124d48cbb0f2cdb5509c5739
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -21,8 -21,8 +21,8 @@@
  #define AVCODEC_VERSION_H
  
  #define LIBAVCODEC_VERSION_MAJOR 53
- #define LIBAVCODEC_VERSION_MINOR 37
 -#define LIBAVCODEC_VERSION_MINOR 23
 -#define LIBAVCODEC_VERSION_MICRO  0
++#define LIBAVCODEC_VERSION_MINOR 38
 +#define LIBAVCODEC_VERSION_MICRO  1
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \

diff --cc libavformat/Makefile
index b597a65fd265b92fdbd8c381e9e84129319f646c,3419148b56fc113bbe44678402b91a5c2ee3a1ee..3581a3d2d55f055fdcc9d5593838432f59d68c23
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -23,12 -21,11 +23,13 @@@ OBJS-$(CONFIG_A64_MUXER
  OBJS-$(CONFIG_AAC_DEMUXER)               += aacdec.o rawdec.o
  OBJS-$(CONFIG_AC3_DEMUXER)               += ac3dec.o rawdec.o
  OBJS-$(CONFIG_AC3_MUXER)                 += rawenc.o
 +OBJS-$(CONFIG_ACT_DEMUXER)               += act.o
 +OBJS-$(CONFIG_ADF_DEMUXER)               += bintext.o sauce.o
+ OBJS-$(CONFIG_ADX_DEMUXER)               += adxdec.o
  OBJS-$(CONFIG_ADTS_MUXER)                += adtsenc.o
  OBJS-$(CONFIG_AEA_DEMUXER)               += aea.o pcm.o
 -OBJS-$(CONFIG_AIFF_DEMUXER)              += aiffdec.o riff.o pcm.o
 -OBJS-$(CONFIG_AIFF_MUXER)                += aiffenc.o riff.o
 +OBJS-$(CONFIG_AIFF_DEMUXER)              += aiffdec.o riff.o pcm.o isom.o
 +OBJS-$(CONFIG_AIFF_MUXER)                += aiffenc.o riff.o isom.o
  OBJS-$(CONFIG_AMR_DEMUXER)               += amr.o
  OBJS-$(CONFIG_AMR_MUXER)                 += amr.o
  OBJS-$(CONFIG_ANM_DEMUXER)               += anm.o

diff --cc libavformat/allformats.c
index 31fa5060f748eb0c1de8708285f86d83d122d025,573b714d33a5146fcf2f6a60f42132d5081b2878..9ba459dd92eae3b243c87aabb349f82eb6160d29
--- 1/libavformat/allformats.c
--- 2/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@@ -51,9 -51,8 +51,10 @@@ void av_register_all(void
      REGISTER_MUXER    (A64, a64);
      REGISTER_DEMUXER  (AAC, aac);
      REGISTER_MUXDEMUX (AC3, ac3);
 +    REGISTER_DEMUXER  (ACT, act);
 +    REGISTER_DEMUXER  (ADF, adf);
      REGISTER_MUXER    (ADTS, adts);
+     REGISTER_DEMUXER  (ADX, adx);
      REGISTER_DEMUXER  (AEA, aea);
      REGISTER_MUXDEMUX (AIFF, aiff);
      REGISTER_MUXDEMUX (AMR, amr);

diff --cc libavformat/segafilm.c
Simple merge

diff --cc libavformat/sol.c
Simple merge

diff --cc libavformat/version.h
index 5c7ed6863e06039f2f9a8c6476e62281b5690d78,37c3d5bc88d4ec9a8d060b32acdd9f7ae811b76a..c98ff60399be61d3c95dcc76c92ac5b2ce03cf37
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -24,7 -24,7 +24,7 @@@
  #include "libavutil/avutil.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 53
- #define LIBAVFORMAT_VERSION_MINOR 21
 -#define LIBAVFORMAT_VERSION_MINOR 16
++#define LIBAVFORMAT_VERSION_MINOR 22
  #define LIBAVFORMAT_VERSION_MICRO  0
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

diff --cc libswscale/swscale.c
Simple merge