diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 12:13:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 12:13:41 +0200 |
| commit | 72eddc10fa1f3ca7fb95292673fa26401f754c92 (patch) | |
| tree | 878039cdab1f882bc68a9e60203e430d42eb8d54 /libavformat/seek.h | |
| parent | 328a5b93d3a493d6a653a83c425fb2cc98e8f41b (diff) | |
| parent | d872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9 (diff) | |
Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9':
lavf: Reset the entry count and allocation size variables on av_reallocp failures
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/seek.h')
0 files changed, 0 insertions, 0 deletions