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