diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 14:24:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 14:25:50 +0200 |
| commit | 204c8798a89665d78d79c77ea5cc13ff1452f2e8 (patch) | |
| tree | e630386ba97b44ff4db431f56c814a1b77242279 /COPYING.GPLv2 | |
| parent | 9767d7513cbc24f01221965c95e65a73bea780d2 (diff) | |
| parent | 0662967d2bbdbe90540eaa8c847f521fa4b75aab (diff) | |
| download | ffmpeg-204c8798a89665d78d79c77ea5cc13ff1452f2e8.tar.gz | |
Merge commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab' into release/1.1
* commit '0662967d2bbdbe90540eaa8c847f521fa4b75aab':
hls, segment: fix splitting for audio-only streams.
afifo: fix request_samples on the last frame in certain cases
id3v2: check for end of file while unescaping tags
indeo3: fix off by one in MV validity check
Conflicts:
libavformat/id3v2.c
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions