summaryrefslogtreecommitdiffstats
path: root/arch.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-28 12:09:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-28 12:20:12 +0200
commitef13967e601bb0851af04182ea2aeeea8a3025bd (patch)
treee14f85be5ae38de983822f7461c753035cdf8778 /arch.mak
parent8518da23f59d8f5a52f7c1c919f584a119484d0f (diff)
parentf13ffb6636fdecb5e3e0ddcff48f096e7b3db362 (diff)
downloadffmpeg-streaming-ef13967e601bb0851af04182ea2aeeea8a3025bd.zip
ffmpeg-streaming-ef13967e601bb0851af04182ea2aeeea8a3025bd.tar.gz
Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'
* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362': flacdec: do not overwrite a channel layout set by the caller Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud