diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:30:58 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:37:20 +0100 |
commit | eb6d64edef4d965c228b122f5c7e018831362c82 (patch) | |
tree | 446560838fe3747ec6ed509a22aab996535b9934 /libavformat/utils.c | |
parent | b69c7f20e84f7aea5f5d8aaf2bdb4ec80044a69f (diff) | |
parent | 11f98c83d1c2a4eecd213bd94a907831fb36a590 (diff) | |
download | ffmpeg-eb6d64edef4d965c228b122f5c7e018831362c82.tar.gz |
Merge commit '11f98c83d1c2a4eecd213bd94a907831fb36a590' into release/1.1
* commit '11f98c83d1c2a4eecd213bd94a907831fb36a590':
img2dec: correctly use the parsed value from -start_number
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions