diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 11:09:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-13 11:09:38 +0100 |
| commit | 799d749c77de28a6790db48b3465ecdc56822d96 (patch) | |
| tree | 79e62292d12bb4615ba643f2d351d9e6657099e0 /libavformat/srtdec.c | |
| parent | 7eb40d85f2258df31287dc7a0704cb35e356c077 (diff) | |
| parent | b9629acb6b647b31b8b4e3932e836189bd03e5b9 (diff) | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'libavformat/srtdec.c')
0 files changed, 0 insertions, 0 deletions