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 /libavformat/hls.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 'libavformat/hls.c')
0 files changed, 0 insertions, 0 deletions