diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-11 10:54:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-11 11:23:40 +0200 |
| commit | cbe47b1e8452e37fda592941e7d3f3bb5920c201 (patch) | |
| tree | 9ea8b6418c4d89e27c98314d41974163b5dbafe8 /libavformat/flic.c | |
| parent | 64b6279d1414378214a58a55f0066fbc95256c9b (diff) | |
| parent | f369b9356c4606cd4d713d60f7db5de119d901fa (diff) | |
Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'
* commit 'f369b9356c4606cd4d713d60f7db5de119d901fa':
avformat: Use av_reallocp_array() where suitable
Conflicts:
libavformat/asfenc.c
libavformat/gxfenc.c
libavformat/mov.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/flic.c')
0 files changed, 0 insertions, 0 deletions