Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 May 2012 20:06:55 +0000 (22:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 May 2012 20:06:55 +0000 (22:06 +0200)
* qatar/master:
  avplay: use libavresample for sample format conversion and channel mixing
  Fix compilation with YASM/NASM without AVX support.
  WMAL: do not output last frame again if nothing was decoded in current packet
  WMAL: do not start decoding if frame does not end in current packet
  adpcm-thp: fix invalid array indexing
  ppc: add const where needed in scalarproduct_int16_altivec()
  ppc: remove shift parameter from scalarproduct_int16_altivec()
  ppc: dsputil: do unaligned block accesses correctly
  dvenc: do not call dsputil functions with stride not a multiple of 16
  APIchanges: fill in some dates and commit hashes

Conflicts:
doc/APIchanges
ffplay.c
libavcodec/adpcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
ffplay.c
libavcodec/adpcm.c
libavcodec/dv.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/int_altivec.c
libavcodec/wmalosslessdec.c

diff --cc doc/APIchanges
@@@ -2,34 -2,24 +2,34 @@@ Never assume the API of libav* to be st
  since the last major version increase.
  
  The last version increases were:
- libavcodec:  2012-01-27
- libavdevice: 2011-04-18
- libavfilter: 2011-04-18
- libavformat: 2012-01-27
- libavresample: 2012-xx-xx
- libpostproc: 2011-04-18
- libswscale:  2011-06-20
- libavutil:   2011-04-18
+ libavcodec:    2012-01-27
+ libavdevice:   2011-04-18
+ libavfilter:   2011-04-18
+ libavformat:   2012-01-27
+ libavresample: 2012-04-24
++libpostproc:   2011-04-18
+ libswscale:    2011-06-20
+ libavutil:     2011-04-18
  
  
  API changes, most recent first:
  
- 2012-04-25 - xxxxxxx - lavu 51.29.0 - cpu.h
 +2012-04-20 - xxxxxxx - lavfi 2.70.100
 +  Add avfilter_unref_bufferp() to avfilter.h.
 +
 +2012-04-12 - xxxxxxx - lavfi 2.68.100
 +  Install libavfilter/asrc_abuffer.h public header.
 +
 +2012-03-26 - a67d9cf - lavfi 2.66.100
 +  Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
 +
+ 2012-04-25 - 3527a73 - lavu 51.29.0 - cpu.h
    Add av_parse_cpu_flags()
  
- 2012-xx-xx - xxxxxxx - lavr 0.0.0
+ 2012-04-24 - c8af852 - lavr 0.0.0
    Add libavresample audio conversion library
  
- 2012-xx-xx - xxxxxxx - lavu 51.28.0 - audio_fifo.h
+ 2012-04-20 - 0c0d1bc - lavu 51.28.0 - audio_fifo.h
    Add audio FIFO functions:
      av_audio_fifo_free()
      av_audio_fifo_alloc()
      av_audio_fifo_size()
      av_audio_fifo_space()
  
- 2012-xx-xx - xxxxxxx - lavfi 2.16.0 - avfiltergraph.h
-   Add avfilter_graph_parse2()
+ 2012-04-14 - lavfi 2.16.0 - avfiltergraph.h
+   d7bcc71 Add avfilter_graph_parse2().
 -  91d3cbe Add avfilter_inout_alloc() and avfilter_inout_free().
  
- 2012-xx-xx - xxxxxxx - lavu 51.27.0 - samplefmt.h
+ 2012-04-08 - 4d693b0 - lavu 51.27.0 - samplefmt.h
    Add av_get_packed_sample_fmt() and av_get_planar_sample_fmt()
  
 -2012-04-05 - 5cc51a5 - lavu 51.26.0 - audioconvert.h
 -  Add av_get_default_channel_layout()
 +2012-03-21 - b75c67d - lavu 51.43.100
 +  Add bprint.h for bprint API.
 +
 +2012-02-21 - 9cbf17e - lavc 54.4.100
 +  Add av_get_pcm_codec() function.
 +
 +2012-02-16 - 560b224 - libswr 0.7.100
 +  Add swr_set_matrix() function.
 +
 +2012-02-09 - c28e7af - lavu 51.39.100
 +  Add a new installed header libavutil/timestamp.h with timestamp
 +  utilities.
 +
 +2012-02-06 - 70ffda3 - lavu 51.38.100
 +  Add av_parse_ratio() function to parseutils.h.
 +
 +2012-02-06 - 70ffda3 - lavu 51.38.100
 +  Add AV_LOG_MAX_OFFSET macro to log.h.
 +
 +2012-02-02 - 0eaa123 - lavu 51.37.100
 +  Add public timecode helpers.
  
 -2012-03-06 - 4d851f8 - lavu 51.25.0 - cpu.h
 -  Add av_set_cpu_flags_mask().
 +2012-01-24 - 0c3577b - lavfi 2.60.100
 +  Add avfilter_graph_dump.
  
  2012-03-05 - lavc 54.8.0
    6699d07 Add av_get_exact_bits_per_sample()
diff --cc ffplay.c
+++ b/ffplay.c
  #include "libavformat/avformat.h"
  #include "libavdevice/avdevice.h"
  #include "libswscale/swscale.h"
- #include "libavcodec/audioconvert.h"
 -#include "libavresample/avresample.h"
  #include "libavutil/opt.h"
  #include "libavcodec/avfft.h"
 +#include "libswresample/swresample.h"
  
  #if CONFIG_AVFILTER
 +# include "libavfilter/avcodec.h"
  # include "libavfilter/avfilter.h"
  # include "libavfilter/avfiltergraph.h"
 +# include "libavfilter/buffersink.h"
  #endif
  
 -#include "cmdutils.h"
 -
  #include <SDL.h>
  #include <SDL_thread.h>
  
@@@ -2130,7 -2121,9 +2129,8 @@@ static int audio_decode_frame(VideoStat
              /* if no pts, then compute it */
              pts = is->audio_clock;
              *pts_ptr = pts;
-             is->audio_clock += (double)data_size / (dec->channels * dec->sample_rate * av_get_bytes_per_sample(dec->sample_fmt));
 -            n = is->sdl_channels * av_get_bytes_per_sample(is->sdl_sample_fmt);
+             is->audio_clock += (double)data_size /
 -                (double)(n * dec->sample_rate);
++                (dec->channels * dec->sample_rate * av_get_bytes_per_sample(dec->sample_fmt));
  #ifdef DEBUG
              {
                  static double last_clock;
@@@ -2373,9 -2323,9 +2373,9 @@@ static void stream_component_close(Vide
          SDL_CloseAudio();
  
          packet_queue_end(&is->audioq);
 -        if (is->avr)
 -            avresample_free(&is->avr);
+         av_free_packet(&is->audio_pkt);
-         av_free_packet(&is->audio_pkt);
 +        if (is->swr_ctx)
 +            swr_free(&is->swr_ctx);
          av_freep(&is->audio_buf1);
          is->audio_buf = NULL;
          av_freep(&is->frame);
Simple merge
diff --cc libavcodec/dv.c
Simple merge
Simple merge
Simple merge
Simple merge