[FFmpeg-cvslog] Merge commit 'eb33ba04e03d9f36e23fffd442510c824be709c3'
Michael Niedermayer
git at videolan.org
Mon Jul 29 14:03:34 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 13:58:21 2013 +0200| [07440c938073c6c83b8b3592dfade690bab9c19e] | committer: Michael Niedermayer
Merge commit 'eb33ba04e03d9f36e23fffd442510c824be709c3'
* commit 'eb33ba04e03d9f36e23fffd442510c824be709c3':
hls: Return all packets from a previous variant before moving on to the next one
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07440c938073c6c83b8b3592dfade690bab9c19e
---
More information about the ffmpeg-cvslog
mailing list