aboutsummaryrefslogtreecommitdiffstats
path: root/arch.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-10 12:40:38 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-10 12:40:41 +0100
commit6e44662b0521dff7966e38c386057ba06c346c0b (patch)
treee9926c94129d3f00371c778f048881b27b940ffb /arch.mak
parent8d691f87776900ec7c4addbed7df87405b16d6df (diff)
parentccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb (diff)
downloadffmpeg-6e44662b0521dff7966e38c386057ba06c346c0b.tar.gz
Merge commit 'ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb'
* commit 'ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb': idcin: set start_time and packet duration instead of manually tracking pts. idcin: set channel_layout Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions