aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/file_open.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-18 14:53:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-18 14:53:41 +0200
commitb06741d26794fd5ef2cd4e6b390c5ba7347e6a4e (patch)
treec1b36e109024d46b9dfa58f70c6fa7c0c710c91d /libavformat/file_open.c
parent8334850a9985dde0e11227902fb007b382aa97e6 (diff)
parent79f2c426fde6e71c40b29504112d0528b85be623 (diff)
downloadffmpeg-b06741d26794fd5ef2cd4e6b390c5ba7347e6a4e.tar.gz
Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'
* commit '79f2c426fde6e71c40b29504112d0528b85be623': dv: do not set codec timebase Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/file_open.c')
0 files changed, 0 insertions, 0 deletions