diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 12:24:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 12:31:52 +0100 |
| commit | 24af050c2fa9c28c85f68ac5425fc3fbaa826343 (patch) | |
| tree | 6b04c400e4c819a13cb920df1acf0df810425c64 /libavcodec/mjpegdec.c | |
| parent | c89751aa218c22e2d0febcafba4b01c533b8836e (diff) | |
| parent | 64f7575fbd64e5b65d5c644347408588c776f1fe (diff) | |
Merge commit '64f7575fbd64e5b65d5c644347408588c776f1fe'
* commit '64f7575fbd64e5b65d5c644347408588c776f1fe':
mov: avoid a memleak when multiple stss boxes are present
Conflicts:
libavformat/mov.c
See: 5ab882d7283f57560c889919c35f2688253b1d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
0 files changed, 0 insertions, 0 deletions