Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:53:41 +0000 (14:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:53:41 +0000 (14:53 +0200)
commitb06741d26794fd5ef2cd4e6b390c5ba7347e6a4e
treec1b36e109024d46b9dfa58f70c6fa7c0c710c91d
parent8334850a9985dde0e11227902fb007b382aa97e6
parent79f2c426fde6e71c40b29504112d0528b85be623
Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'

* commit '79f2c426fde6e71c40b29504112d0528b85be623':
  dv: do not set codec timebase

Conflicts:
libavformat/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dv.c