aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/soxenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-09 02:36:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-09 02:37:17 +0100
commit4040b56f5afd07df6403df2a76206b54c79449cf (patch)
tree68d1be3b443549542ee36afd7387cb78daa59396 /libavformat/soxenc.c
parent73be2ebe96ee09dbd7c99f0ee0891fb0f585cdc2 (diff)
parentc1e7de8f62c7fd71e23d62969a618f042059381f (diff)
downloadffmpeg-4040b56f5afd07df6403df2a76206b54c79449cf.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: mlp_parser: fix request_channel_layout behavior. Conflicts: libavcodec/mlp_parser.c See: bd35d58463f01f7781df052864ae16f5e228c1bc Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/soxenc.c')
0 files changed, 0 insertions, 0 deletions