diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:47:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:52:20 +0200 |
| commit | 552945efe62d0b6605efa2f5ad7b788c728d71b5 (patch) | |
| tree | c6cd3604414163e9cbb0fe5081df17b7d627cb3b /libavresample | |
| parent | 8c766228c180d183fecccb625432edf179965ad9 (diff) | |
| parent | b6c7bd53f4ba3dd3400f4422b65ee844678c6b72 (diff) | |
| download | ffmpeg-552945efe62d0b6605efa2f5ad7b788c728d71b5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenchint: Clear size and len if the realloc failed
Conflicts:
libavformat/movenchint.c
See: 63621762eccf4c825ef1d42251b0d45d0c498826
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions