diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-30 17:42:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-30 17:52:23 +0200 |
| commit | ba12ba859aabfa7153ba397d869db13acdaba340 (patch) | |
| tree | a4cb72af4f5c21ec64bd9af3e326c1b2ad18a7d6 /libavcodec/mpl2dec.c | |
| parent | 8e67599505e3b0a968227a1dcd40020dff874001 (diff) | |
| parent | 0c73a5a53cc97f4291bbe9e1e68226edf6161744 (diff) | |
| download | ffmpeg-ba12ba859aabfa7153ba397d869db13acdaba340.tar.gz | |
Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'
* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
hls: Save and forward avio options
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpl2dec.c')
0 files changed, 0 insertions, 0 deletions