diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-10 09:56:29 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-10 09:56:29 +0200 |
commit | 80fd6225907d4f3e57a3c17944f5cf4edd1000cd (patch) | |
tree | 194b6aa3eab331b2eb8cb8fc14882775c022bd91 /libavformat/smjpeg.c | |
parent | 8b1007ead88b99ab0d37eadcf0390970eea230ac (diff) | |
parent | 00cc10aee380f882507bac994ac469d8358d12e8 (diff) | |
download | ffmpeg-80fd6225907d4f3e57a3c17944f5cf4edd1000cd.tar.gz |
Merge commit '00cc10aee380f882507bac994ac469d8358d12e8'
* commit '00cc10aee380f882507bac994ac469d8358d12e8':
asfdec: do not skip padding if offset is above packet size - padding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/smjpeg.c')
0 files changed, 0 insertions, 0 deletions