diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-19 01:25:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-19 01:25:50 +0200 |
| commit | 602d0bfe67ce20e169433ca583153e5c01c84016 (patch) | |
| tree | 995e83b980b76935144df98082d73ddd43bbeb09 /libavformat/jvdec.c | |
| parent | f8ca8138f01d0a7d96d4e1ea65fecd1197f96206 (diff) | |
| parent | 2090abcc436df92969634577c91ea1d1143d4533 (diff) | |
| download | ffmpeg-602d0bfe67ce20e169433ca583153e5c01c84016.tar.gz | |
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jvdec.c')
0 files changed, 0 insertions, 0 deletions