diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 11:27:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 11:27:17 +0100 |
| commit | b78074fd13ad340b8ea4bb83440da336a0de1e40 (patch) | |
| tree | ff8729c5be0ce419330d8b3dde03cfb327b0b7a5 /libavformat/apngdec.c | |
| parent | 5f30522894d19a14324b80bc282c094dabdb31c0 (diff) | |
| parent | ee37620b6ae4783cda637408422044b2d14a688c (diff) | |
Merge commit 'ee37620b6ae4783cda637408422044b2d14a688c'
* commit 'ee37620b6ae4783cda637408422044b2d14a688c':
movenc: Add a flag for indicating a discontinuous fragment
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/apngdec.c')
0 files changed, 0 insertions, 0 deletions