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)
* 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>
1  2 
libavformat/idcin.c

Simple merge