aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/qcp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-13 10:55:07 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-13 10:55:07 +0100
commit7eb40d85f2258df31287dc7a0704cb35e356c077 (patch)
treefc2054037b541d507aa2af4009dd85ad41eeaaf3 /libavformat/qcp.c
parenta8f2420e06d515d71724d83b3f73f31328e8ebd5 (diff)
parentef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b (diff)
downloadffmpeg-7eb40d85f2258df31287dc7a0704cb35e356c077.tar.gz
Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'
* 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>
Diffstat (limited to 'libavformat/qcp.c')
0 files changed, 0 insertions, 0 deletions