diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:33:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 00:33:52 +0200 |
| commit | a137e50ee54cd902c436d15463c6e621623cc9ad (patch) | |
| tree | cd35fd68925ba2612944cac13cedbfd5c508127b /tests/ref/vsynth/vsynth2-jpeg2000 | |
| parent | fcc117af30bcf59c7ae61a90bdebba0472dd3ddc (diff) | |
| parent | dc1de0b958836545339611e9c050a1d4fdded263 (diff) | |
| download | ffmpeg-a137e50ee54cd902c436d15463c6e621623cc9ad.tar.gz | |
Merge commit 'dc1de0b958836545339611e9c050a1d4fdded263'
* commit 'dc1de0b958836545339611e9c050a1d4fdded263':
h261: Set 'still image mode off' in picture header
Conflicts:
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth2-h261
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth2-jpeg2000')
0 files changed, 0 insertions, 0 deletions