diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 11:48:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 11:48:40 +0200 |
| commit | 54056c149333034414b86b6771692ea5862862d4 (patch) | |
| tree | ac2482fa9f226f0f3c6e3594a812c33e993243ae /ffplay.c | |
| parent | 0fb64da63fb72a642d3e69480470de39008745e5 (diff) | |
| parent | cf679b9476727a237c8006c685ace18acba149ab (diff) | |
| download | ffmpeg-54056c149333034414b86b6771692ea5862862d4.tar.gz | |
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@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions