Merge commit 'ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 11:40:38 +0000 (12:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 11:40:41 +0000 (12:40 +0100)
commit6e44662b0521dff7966e38c386057ba06c346c0b
treee9926c94129d3f00371c778f048881b27b940ffb
parent8d691f87776900ec7c4addbed7df87405b16d6df
parentccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb
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>
libavformat/idcin.c