diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-28 20:37:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-28 20:37:28 +0100 |
| commit | 0b4fc4bacd866b14b74bcfb1656a1f469da6ad46 (patch) | |
| tree | 331df0308031c1b0871b394c96d6999b565bdac7 /libavformat/nutenc.c | |
| parent | 37984ca13334f1715d33fd490ef243aea6c97c09 (diff) | |
| parent | 3c18a7b18807de81566381a1bcbe9f6103c0296b (diff) | |
| download | ffmpeg-0b4fc4bacd866b14b74bcfb1656a1f469da6ad46.tar.gz | |
Merge commit '3c18a7b18807de81566381a1bcbe9f6103c0296b'
* commit '3c18a7b18807de81566381a1bcbe9f6103c0296b':
avio: Do not consider the end-of-buffer position valid
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
0 files changed, 0 insertions, 0 deletions