summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) yop: set channel layout wtv: set channel layout for mpeg audio westwood_aud: set channel layout wc3movie: set channel layout tmv: set channel layout tiertexseq: set channel layout swfdec: set channel layout sol: set channel layout smacker: set channel layout siff: set channel layout sierravmd: set channel layout rtpdec_amr: set channel layout rsodec: set channel layout rmdec: set channel layout for RA version 3 qcp: set channel layout psxstr: set channel layout omadec: set channel layout oggparsespeex: validate channel count and set channel layout nuv: set channel layout mxg: set channel layout ... Conflicts: libavformat/swfdec.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yop: set channel layoutJustin Ruggles2012-11-12
| |
| * wtv: set channel layout for mpeg audioJustin Ruggles2012-11-12
| |
| * westwood_aud: set channel layoutJustin Ruggles2012-11-12
| |
| * wc3movie: set channel layoutJustin Ruggles2012-11-12
| |
| * tmv: set channel layoutJustin Ruggles2012-11-12
| |
| * tiertexseq: set channel layoutJustin Ruggles2012-11-12
| |
| * swfdec: set channel layoutJustin Ruggles2012-11-12
| |
| * sol: set channel layoutJustin Ruggles2012-11-12
| |
| * smacker: set channel layoutJustin Ruggles2012-11-12
| |
| * siff: set channel layoutJustin Ruggles2012-11-12
| |
| * sierravmd: set channel layoutJustin Ruggles2012-11-12
| |
| * rtpdec_amr: set channel layoutJustin Ruggles2012-11-12
| |
| * rsodec: set channel layoutJustin Ruggles2012-11-12
| |
| * rmdec: set channel layout for RA version 3Justin Ruggles2012-11-12
| |
| * qcp: set channel layoutJustin Ruggles2012-11-12
| |
| * psxstr: set channel layoutJustin Ruggles2012-11-12
| |
| * omadec: set channel layoutJustin Ruggles2012-11-12
| |
| * oggparsespeex: validate channel count and set channel layoutJustin Ruggles2012-11-12
| |
| * nuv: set channel layoutJustin Ruggles2012-11-12
| |
| * mxg: set channel layoutJustin Ruggles2012-11-12
| |
| * mvi: set channel layoutJustin Ruggles2012-11-12
| |
| * mpc7: set channel layoutJustin Ruggles2012-11-12
| |
| * mmf: set channel layoutJustin Ruggles2012-11-12
| |
| * mm: set channel layoutJustin Ruggles2012-11-12
| |
* | Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'Michael Niedermayer2012-11-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits) jvdec: set channel layout iss: set channel layout ipmovie: set channel layout iff: set channel layout idroqdec: set channel layout gxfdec: set channel layout when applicable gsmdec: set channel layout flvdec: set channel layout dv: set channel layout dsicin: set channel layout daud: set channel layout cdxl: set channel layout bmv: set channel layout bink: set channel layout bfi: set channel layout bethsoftvid: set channel layout apc: set channel layout amr: set channel_layout ppc: replace pointer casting with AV_COPY32 ppc: fix some unused variable warnings ... Conflicts: libavformat/amr.c libavformat/iff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jvdec: set channel layoutJustin Ruggles2012-11-12
| |
| * iss: set channel layoutJustin Ruggles2012-11-12
| |
| * ipmovie: set channel layoutJustin Ruggles2012-11-12
| |
| * iff: set channel layoutJustin Ruggles2012-11-12
| |
| * idroqdec: set channel layoutJustin Ruggles2012-11-12
| |
| * gxfdec: set channel layout when applicableJustin Ruggles2012-11-12
| |
| * gsmdec: set channel layoutJustin Ruggles2012-11-12
| |
| * flvdec: set channel layoutJustin Ruggles2012-11-12
| |
| * dv: set channel layoutJustin Ruggles2012-11-12
| |
| * dsicin: set channel layoutJustin Ruggles2012-11-12
| |
| * daud: set channel layoutJustin Ruggles2012-11-12
| | | | | | | | Update FATE reference due to WAVE channel mask now being set correctly.
| * cdxl: set channel layoutJustin Ruggles2012-11-12
| |
| * bmv: set channel layoutJustin Ruggles2012-11-12
| |
| * bink: set channel layoutJustin Ruggles2012-11-12
| |
| * bfi: set channel layoutJustin Ruggles2012-11-12
| |
| * bethsoftvid: set channel layoutJustin Ruggles2012-11-12
| |
| * apc: set channel layoutJustin Ruggles2012-11-12
| |
| * amr: set channel_layoutJustin Ruggles2012-11-12
| |
| * ppc: replace pointer casting with AV_COPY32Mans Rullgard2012-11-12
| | | | | | | | | | | | This removes warnings about strict aliasing violations. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ppc: fix some unused variable warningsMans Rullgard2012-11-12
| | | | | | | | | | | | | | The third argument of OP_U8_ALTIVEC is evaluated at most once so there is no need for a potentially unused temporary variable. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * configure: remove support for -n flag in print_enabled()Mans Rullgard2012-11-12
| | | | | | | | | | | | This flag is no longer used. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | remove tests/asynth1.swMichael Niedermayer2012-11-13
| | | | | | | | | | | | | | This file appears to have been commited by 100l mistake. Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate/avfilter: honor GPL dependency.Clément Bœsch2012-11-13
| |
* | wavpack: check the blocks sample count, fix out of array accessesMichael Niedermayer2012-11-13
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>