-
Michael Niedermayer authored
* commit '79f2c426': dv: do not set codec timebase Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
b06741d2
* commit '79f2c426': dv: do not set codec timebase Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>