Merge commit 'f261e508459e28beca59868a878e1519a44bb678'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:13:04 +0000 (14:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 12:13:22 +0000 (14:13 +0200)
commit107a56c1ed8c95ea668a073fb865c4dac19ffd38
tree064636a7576ecfef3cdb797cdf6253001c4a303e
parent73f940e4d94c8f7bc8713af6e092d1d580de81fd
parentf261e508459e28beca59868a878e1519a44bb678
Merge commit 'f261e508459e28beca59868a878e1519a44bb678'

* commit 'f261e508459e28beca59868a878e1519a44bb678':
  dca: Error out on missing DSYNC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadec.c