diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-01 22:06:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-01 22:06:55 +0200 |
| commit | 75f847aa6b1bc88733e59d680809f614977b4c07 (patch) | |
| tree | 53261bf30de91f2f8c831d51b65e002840415e3d /ffplay.c | |
| parent | aab5a4521c4034c218cbd72325b5d1946a3ec3c2 (diff) | |
| parent | f1ffb01ee9fd3a15c395c3cf6ff362ac5cd668d0 (diff) | |
| download | ffmpeg-75f847aa6b1bc88733e59d680809f614977b4c07.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -40,7 +40,6 @@ #include "libavformat/avformat.h" #include "libavdevice/avdevice.h" #include "libswscale/swscale.h" -#include "libavcodec/audioconvert.h" #include "libavutil/opt.h" #include "libavcodec/avfft.h" #include "libswresample/swresample.h" @@ -2130,7 +2129,8 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) /* 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)); + is->audio_clock += (double)data_size / + (dec->channels * dec->sample_rate * av_get_bytes_per_sample(dec->sample_fmt)); #ifdef DEBUG { static double last_clock; @@ -2373,9 +2373,9 @@ static void stream_component_close(VideoState *is, int stream_index) SDL_CloseAudio(); packet_queue_end(&is->audioq); + av_free_packet(&is->audio_pkt); if (is->swr_ctx) swr_free(&is->swr_ctx); - av_free_packet(&is->audio_pkt); av_freep(&is->audio_buf1); is->audio_buf = NULL; av_freep(&is->frame); |