eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
b7ed18b9bd0f73f1c7aa5533918ea5013dbd593c
ffmpeg/libavformat/hls.c
Michael Niedermayer 95960027a5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hls: Call avformat_find_stream_info() on the chained demuxers

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-31 11:01:30 +02:00

28 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink