diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-29 14:31:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-07-29 14:35:40 +0200 |
| commit | 994e09345ef9547be89e99ded3c3f68cd3cf81dd (patch) | |
| tree | ab54ea6bb52e34f4c341cf85a820192ecc21ce88 /libavutil/parseutils.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 <[email protected]>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions