Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avformat: Avoid a warning about mixed declarations and code
  BMV demuxer and decoder
  matroskaenc: Make sure the seekhead struct is freed even on seek failure
  mpeg12enc: Remove write-only variables.
  mpeg12enc: Don't set up run-level info for level 0.
  msmpeg4: Don't set up run-level info for level 0.
  avformat: Warn about using network functions without calling avformat_network_init
  avformat: Revise wording
  rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
  rdt: Check the return value of avformat_open
  rtsp: Discard the dynamic handler, if it has an alloc function which failed
  dsputil: use cpuflags in x86 versions of vector_clip_int32()

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

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

diff --cc Changelog
index 084bac32a9561bfd7c8f805d7cd6ff2989c46842,5387a6522fa3401068f5a7df933d42af73eaecf6..2e8d8af4551bfc85041fde35c101cd7e26e73e4e
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -118,12 -99,35 +118,13 @@@ easier to use. The changes are
    AVCodecContext deprecated. Codec private options should be used instead.
  - Properly working defaults in libx264 wrapper, support for native presets.
  - Encrypted OMA files support
+ - Discworld II BMV decoding support
  
  
 -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
index e5f83d6d303de8811bdd37a9b037dbbaa3aafd98,3187f2cc780aa87387a7b6ab673cf5b525b18ec0..f026bfba179477560e62d5ba0fecd3c80dfd45f6
--- 1/doc/general.texi
--- 2/doc/general.texi
+++ b/doc/general.texi
@@@ -620,13 -608,12 +622,14 @@@ following image formats are supported
  @item Atrac 3                @tab     @tab  X
  @item Bink Audio             @tab     @tab  X
      @tab Used in Bink and Smacker files in many games.
 +@item CELT                   @tab     @tab  E
 +    @tab decoding supported through external library libcelt
  @item Delphine Software International CIN audio  @tab     @tab  X
      @tab Codec used in Delphine Software International games.
+ @item Discworld II BMV Audio @tab     @tab  X
  @item COOK                   @tab     @tab  X
      @tab All versions except 5.1 are supported.
 -@item DCA (DTS Coherent Acoustics)  @tab     @tab  X
 +@item DCA (DTS Coherent Acoustics)  @tab  X  @tab  X
  @item DPCM id RoQ            @tab  X  @tab  X
      @tab Used in Quake III, Jedi Knight 2, other computer games.
  @item DPCM Interplay         @tab     @tab  X

diff --cc libavcodec/Makefile
index 0178f8fc6efbacd79958056fb8e79455d774b68f,413b04d1422963a6a376d261d6931433bbb36147..2ffb5fdec6bb157873daefcdd74d66633468a3e4
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -97,9 -92,10 +97,11 @@@ OBJS-$(CONFIG_BFI_DECODER)             
  OBJS-$(CONFIG_BINK_DECODER)            += bink.o binkdsp.o
  OBJS-$(CONFIG_BINKAUDIO_DCT_DECODER)   += binkaudio.o wma.o
  OBJS-$(CONFIG_BINKAUDIO_RDFT_DECODER)  += binkaudio.o wma.o
 +OBJS-$(CONFIG_BINTEXT_DECODER)         += bintext.o cga_data.o
  OBJS-$(CONFIG_BMP_DECODER)             += bmp.o msrledec.o
  OBJS-$(CONFIG_BMP_ENCODER)             += bmpenc.o
+ OBJS-$(CONFIG_BMV_VIDEO_DECODER)       += bmv.o
+ OBJS-$(CONFIG_BMV_AUDIO_DECODER)       += bmv.o
  OBJS-$(CONFIG_C93_DECODER)             += c93.o
  OBJS-$(CONFIG_CAVS_DECODER)            += cavs.o cavsdec.o cavsdsp.o \
                                            mpeg12data.o mpegvideo.o

diff --cc libavcodec/allcodecs.c
index 7ba2ab3f897be56d94a3a9c7555895dec2c5b857,2beb81c0b8e831ce52958ae7a50550e86a77c67d..61678a64e9bf1d31b94f897a8644d0cca2569e08
--- 1/libavcodec/allcodecs.c
--- 2/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@@ -256,8 -243,9 +257,9 @@@ void avcodec_register_all(void
      REGISTER_DECODER (ATRAC3, atrac3);
      REGISTER_DECODER (BINKAUDIO_DCT, binkaudio_dct);
      REGISTER_DECODER (BINKAUDIO_RDFT, binkaudio_rdft);
+     REGISTER_DECODER (BMV_AUDIO, bmv_audio);
      REGISTER_DECODER (COOK, cook);
 -    REGISTER_DECODER (DCA, dca);
 +    REGISTER_ENCDEC  (DCA, dca);
      REGISTER_DECODER (DSICINAUDIO, dsicinaudio);
      REGISTER_ENCDEC  (EAC3, eac3);
      REGISTER_ENCDEC  (FLAC, flac);

diff --cc libavcodec/avcodec.h
index aedacd76c8e8aade84de731f8cfc58d788394cb2,f169bec37e487c85f13942bb7a1b691b404d8566..07377c87c74aa57c7de923de4c62c67fc17d66a2
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -216,13 -215,11 +216,14 @@@ enum CodecID 
      CODEC_ID_WMV3IMAGE,
      CODEC_ID_VC1IMAGE,
  #if LIBAVCODEC_VERSION_MAJOR == 53
 -    CODEC_ID_G723_1,
 -    CODEC_ID_G729,
 +    CODEC_ID_G723_1_DEPRECATED,
 +    CODEC_ID_G729_DEPRECATED,
  #endif
 -    CODEC_ID_UTVIDEO,
 +    CODEC_ID_UTVIDEO_DEPRECATED,
+     CODEC_ID_BMV_VIDEO,
 +    CODEC_ID_UTVIDEO = 0x800,
 +
 +    CODEC_ID_G2M        = MKBETAG( 0 ,'G','2','M'),
  
      /* various PCM "codecs" */
      CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@@ -363,9 -360,7 +364,10 @@@
      CODEC_ID_8SVX_EXP,
      CODEC_ID_8SVX_FIB,
  #endif
+     CODEC_ID_BMV_AUDIO,
 +    CODEC_ID_G729 = 0x15800,
 +    CODEC_ID_G723_1= 0x15801,
 +    CODEC_ID_8SVX_RAW   = MKBETAG('8','S','V','X'),
  
      /* subtitle codecs */
      CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.

diff --cc libavcodec/mpeg12enc.c
Simple merge

diff --cc libavcodec/msmpeg4.c
Simple merge

diff --cc libavcodec/version.h
index 6cbc3f650aaf7fac16d651e66102c6d3f88132af,5e07ec28e3f4f7bbd0094fb364b31b33f0e1ffa0..b09a9c5314f0d4e14dc9f15b4580c92d63e327e4
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -21,7 -21,7 +21,7 @@@
  #define AVCODEC_VERSION_H
  
  #define LIBAVCODEC_VERSION_MAJOR 53
- #define LIBAVCODEC_VERSION_MINOR 28
 -#define LIBAVCODEC_VERSION_MINOR 17
++#define LIBAVCODEC_VERSION_MINOR 29
  #define LIBAVCODEC_VERSION_MICRO  0
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libavcodec/x86/dsputil_yasm.asm
Simple merge

diff --cc libavformat/Makefile
index 420143db6770f2042431e2bb5f740de2bce44f68,0c7d258640807ca78eb22a99b37c41eea8674315..32fac6a8e9abbb51be332b7548d2e8714d8699df
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -50,12 -46,9 +50,13 @@@ OBJS-$(CONFIG_AVS_DEMUXER
  OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
  OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
  OBJS-$(CONFIG_BINK_DEMUXER)              += bink.o
 +OBJS-$(CONFIG_BINTEXT_DEMUXER)           += bintext.o sauce.o
 +OBJS-$(CONFIG_BIT_DEMUXER)               += bit.o
 +OBJS-$(CONFIG_BIT_MUXER)                 += bit.o
+ OBJS-$(CONFIG_BMV_DEMUXER)               += bmv.o
  OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
  OBJS-$(CONFIG_CAF_DEMUXER)               += cafdec.o caf.o mov.o riff.o isom.o
 +OBJS-$(CONFIG_CAF_MUXER)                 += cafenc.o caf.o riff.o isom.o
  OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += cavsvideodec.o rawdec.o
  OBJS-$(CONFIG_CAVSVIDEO_MUXER)           += rawenc.o
  OBJS-$(CONFIG_CDG_DEMUXER)               += cdg.o

diff --cc libavformat/allformats.c
index ced4b0a217d69a4f6c0ed11242231a8ba558496d,00924c8a11c6468203ee10f4dc4babc78effd8cc..23d568c01727a4d49c0ec16d5d586f3e49106be0
--- 1/libavformat/allformats.c
--- 2/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@@ -71,11 -69,10 +71,12 @@@ void av_register_all(void
      REGISTER_DEMUXER  (AVS, avs);
      REGISTER_DEMUXER  (BETHSOFTVID, bethsoftvid);
      REGISTER_DEMUXER  (BFI, bfi);
 +    REGISTER_DEMUXER  (BINTEXT, bintext);
      REGISTER_DEMUXER  (BINK, bink);
 +    REGISTER_MUXDEMUX (BIT, bit);
+     REGISTER_DEMUXER  (BMV, bmv);
      REGISTER_DEMUXER  (C93, c93);
 -    REGISTER_DEMUXER  (CAF, caf);
 +    REGISTER_MUXDEMUX (CAF, caf);
      REGISTER_MUXDEMUX (CAVSVIDEO, cavsvideo);
      REGISTER_DEMUXER  (CDG, cdg);
      REGISTER_MUXER    (CRC, crc);

diff --cc libavformat/avformat.h
Simple merge

diff --cc libavformat/matroskaenc.c
Simple merge

diff --cc libavformat/network.c
Simple merge

diff --cc libavformat/network.h
Simple merge

diff --cc libavformat/rdt.c
Simple merge

diff --cc libavformat/rmdec.c
Simple merge

diff --cc libavformat/rtsp.c
Simple merge

diff --cc libavformat/utils.c
Simple merge

diff --cc libavformat/version.h
index bc427d3f4e017ae9839a8c0cd9e1dc45bb59a54f,ec5d1fda03e774f50191514175b7d97d857dfafe..954d87a88e3f6e9c1109eedadba4b7118d5afbe9
--- 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 19
 -#define LIBAVFORMAT_VERSION_MINOR 14
++#define LIBAVFORMAT_VERSION_MINOR 20
  #define LIBAVFORMAT_VERSION_MICRO  0
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \