aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ac3.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-26 23:28:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-26 23:37:07 +0200
commit371cb96414bb77edaf0333ff818be88f0092a094 (patch)
tree3ad6cfdd9749feb144ecbe3018acd27748ab9a6f /libavcodec/ac3.h
parent7cf086555177d7b898569bd54a98e98ca94476e1 (diff)
parent56f98e340fca894a76d1ddbe33118b8d8c4db34a (diff)
downloadffmpeg-371cb96414bb77edaf0333ff818be88f0092a094.tar.gz
Merge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'
* commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a': output example: convert audio to the format supported by the encoder Conflicts: doc/examples/muxing.c Not merged as our example code already does that for what is needed and we generate matching data for the rest. generating fixed data and converting all parameters could be done of course. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3.h')
0 files changed, 0 insertions, 0 deletions