diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 16:40:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 16:40:04 +0200 |
| commit | 4a993335812f7e9b2088145c7d043c01019c5d04 (patch) | |
| tree | 90fa4e0b4419c61d34111694e8ea64afd722ac8f /libavcodec/pnmdec.c | |
| parent | e93028790087e632569e94f193b333073a67cf14 (diff) | |
| parent | 874390e163427c1fe7682ab27924a7843780dbb3 (diff) | |
| download | ffmpeg-4a993335812f7e9b2088145c7d043c01019c5d04.tar.gz | |
Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'
* commit '874390e163427c1fe7682ab27924a7843780dbb3':
lavc: add a convenience function for rescaling timestamps in a packet
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnmdec.c')
0 files changed, 0 insertions, 0 deletions