Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Apr 2011 21:36:57 +0000 (23:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Apr 2011 21:43:54 +0000 (23:43 +0200)
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
52 files changed:
1  2 
doc/issue_tracker.txt
doc/muxers.texi
libavcodec/8bps.c
libavcodec/ac3.c
libavcodec/ac3dec.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/cinepak.c
libavcodec/dsputil.c
libavcodec/dv.c
libavcodec/dxva2.h
libavcodec/dxva2_h264.c
libavcodec/idcinvideo.c
libavcodec/interplayvideo.c
libavcodec/jpeglsdec.c
libavcodec/kmvc.c
libavcodec/libdirac.h
libavcodec/libdiracdec.c
libavcodec/libschroedingerdec.c
libavcodec/libtheoraenc.c
libavcodec/mimic.c
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/rawdec.c
libavcodec/smc.c
libavcodec/targa.c
libavcodec/truemotion2.c
libavcodec/tscc.c
libavcodec/utils.c
libavcodec/vaapi_h264.c
libavcodec/vaapi_mpeg4.c
libavcodec/vaapi_vc1.c
libavcodec/vc1.h
libavcodec/vc1dec.c
libavcodec/vorbis_enc.c
libavcodec/wmavoice.c
libavfilter/vf_fade.c
libavformat/asf.h
libavformat/asfdec.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/idcin.c
libavformat/ipmovie.c
libavformat/isom.h
libavformat/mov.c
libavformat/mpegtsenc.c
libavformat/mxfenc.c
libavutil/error.c
libavutil/error.h
tools/patcheck

Simple merge
diff --cc doc/muxers.texi
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc libavcodec/dv.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -45,8 -44,12 +45,10 @@@ typedef struct 
  
      uint16_t stream_language_index;
  
+     int      palette_changed;
+     uint32_t palette[256];
  } ASFStream;
  
 -typedef uint8_t ff_asf_guid[16];
 -
  typedef struct {
      ff_asf_guid guid;                  ///< generated by client computer
      uint64_t file_size;         /**< in bytes
Simple merge
Simple merge
Simple merge
@@@ -226,8 -222,9 +222,9 @@@ static int idcin_read_packet(AVFormatCo
      int palette_scale;
      unsigned char r, g, b;
      unsigned char palette_buffer[768];
+     uint32_t palette[256];
  
 -    if (s->pb->eof_reached)
 +    if (url_feof(s->pb))
          return AVERROR(EIO);
  
      if (idcin->next_chunk_is_video) {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/patcheck
Simple merge