Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Sep 2011 20:37:24 +0000 (22:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Sep 2011 20:39:52 +0000 (22:39 +0200)
* qatar/master:
  flvdec: Fix invalid pointer deferences when parsing index
  configure: disable hardware capabilities ELF section with suncc on Solaris x86
  Use explicit struct initializers for AVCodec declarations.
  Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
  adpcmenc: Set bits_per_coded_sample
  adpcmenc: fix QT IMA ADPCM encoder
  adpcmdec: Fix QT IMA ADPCM decoder
  permit decoding of multichannel ADPCM_EA_XAS
  Fix input buffer size check in adpcm_ea decoder.
  fft: avoid a signed overflow
  mpegps: Handle buffer exhaustion when reading packets.

Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavdevice/alsa-audio-enc.c
libavformat/flvdec.c
libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
35 files changed:
1  2 
configure
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/dpcm.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpeg.c
libavcodec/libvorbis.c
libavcodec/ljpegenc.c
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodec_float.c
libavcodec/ra144dec.c
libavcodec/ra144enc.c
libavcodec/ra288.c
libavcodec/roqvideoenc.c
libavcodec/twinvq.c
libavcodec/utils.c
libavcodec/wmadec.c
libavcodec/wmaenc.c
libavcodec/x86/fft_3dn2.c
libavcodec/x86/fft_sse.c
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/bktr.c
libavdevice/jack_audio.c
libavdevice/oss_audio.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/daud.c
libavformat/idroqenc.c
libavformat/mpeg.c
libavformat/pcmdec.c
libavformat/pcmenc.c
libavformat/txd.c

diff --cc configure
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
@@@ -102,28 -101,14 +102,26 @@@ static int audio_write_packet(AVFormatC
      return 0;
  }
  
 +static void
 +audio_get_output_timestamp(AVFormatContext *s1, int stream,
 +    int64_t *dts, int64_t *wall)
 +{
 +    AlsaData *s  = s1->priv_data;
 +    snd_pcm_sframes_t delay = 0;
 +    *wall = av_gettime();
 +    snd_pcm_delay(s->h, &delay);
 +    *dts = s1->streams[0]->cur_dts - delay;
 +}
 +
  AVOutputFormat ff_alsa_muxer = {
-     "alsa",
-     NULL_IF_CONFIG_SMALL("ALSA audio output"),
-     "",
-     "",
-     sizeof(AlsaData),
-     DEFAULT_CODEC_ID,
-     CODEC_ID_NONE,
-     audio_write_header,
-     audio_write_packet,
-     ff_alsa_close,
+     .name           = "alsa",
+     .long_name      = NULL_IF_CONFIG_SMALL("ALSA audio output"),
+     .priv_data_size = sizeof(AlsaData),
+     .audio_codec    = DEFAULT_CODEC_ID,
+     .video_codec    = CODEC_ID_NONE,
+     .write_header   = audio_write_header,
+     .write_packet   = audio_write_packet,
+     .write_trailer  = ff_alsa_close,
 +    .get_output_timestamp = audio_get_output_timestamp,
-     .flags = AVFMT_NOFILE,
+     .flags          = AVFMT_NOFILE,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -423,8 -418,7 +423,8 @@@ static int mpegps_read_packet(AVFormatC
  {
      MpegDemuxContext *m = s->priv_data;
      AVStream *st;
-     int len, startcode, i, es_type;
+     int len, startcode, i, es_type, ret;
 +    int request_probe= 0;
      enum CodecID codec_id = CODEC_ID_NONE;
      enum AVMediaType type;
      int64_t pts, dts, dummy_pos; //dummy_pos is needed for the index building to work
Simple merge
Simple merge
Simple merge