diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 14:53:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 14:53:41 +0200 |
| commit | b06741d26794fd5ef2cd4e6b390c5ba7347e6a4e (patch) | |
| tree | c1b36e109024d46b9dfa58f70c6fa7c0c710c91d /libavcodec/jpeg2000.h | |
| parent | 8334850a9985dde0e11227902fb007b382aa97e6 (diff) | |
| parent | 79f2c426fde6e71c40b29504112d0528b85be623 (diff) | |
| download | ffmpeg-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 'libavcodec/jpeg2000.h')
0 files changed, 0 insertions, 0 deletions