diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:31:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:35:40 +0200 |
| commit | 994e09345ef9547be89e99ded3c3f68cd3cf81dd (patch) | |
| tree | ab54ea6bb52e34f4c341cf85a820192ecc21ce88 /libavformat/hls.c | |
| parent | 65dcb544934463db871b667fe2b9dd38d5bf48a4 (diff) | |
| parent | c110cbf6b59dfa0f3fc712b4e3c9095e33c57b50 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hls: Create an AVProgram for each variant
Conflicts:
libavformat/hls.c
See: 23db5418ed2ebaddbbc57a45b81caa6e94724587
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hls.c')
| -rw-r--r-- | libavformat/hls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 900fe97607..55dcf63b1b 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -536,7 +536,8 @@ static int hls_read_header(AVFormatContext *s) struct variant *v = c->variants[i]; AVInputFormat *in_fmt = NULL; char bitrate_str[20]; - AVProgram *program = NULL; + AVProgram *program; + if (v->n_segments == 0) continue; @@ -582,7 +583,6 @@ static int hls_read_header(AVFormatContext *s) goto fail; snprintf(bitrate_str, sizeof(bitrate_str), "%d", v->bandwidth); - /* Create new AVprogram for variant i */ program = av_new_program(s, i); if (!program) goto fail; |