[FFmpeg-cvslog] Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'
Michael Niedermayer
git at videolan.org
Sun Apr 28 12:03:28 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 28 11:48:40 2013 +0200| [54056c149333034414b86b6771692ea5862862d4] | committer: Michael Niedermayer
Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'
* commit 'cf679b9476727a237c8006c685ace18acba149ab':
hls, segment: fix splitting for audio-only streams.
Conflicts:
libavformat/hlsenc.c
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54056c149333034414b86b6771692ea5862862d4
---
More information about the ffmpeg-cvslog
mailing list