mirror of
				https://github.com/ytdl-org/youtube-dl.git
				synced 2025-11-01 09:26:45 -07:00 
			
		
		
		
	Start moving to ytdl-org
This commit is contained in:
		@@ -239,7 +239,7 @@ class FFmpegFD(ExternalFD):
 | 
			
		||||
            # setting -seekable prevents ffmpeg from guessing if the server
 | 
			
		||||
            # supports seeking(by adding the header `Range: bytes=0-`), which
 | 
			
		||||
            # can cause problems in some cases
 | 
			
		||||
            # https://github.com/rg3/youtube-dl/issues/11800#issuecomment-275037127
 | 
			
		||||
            # https://github.com/ytdl-org/youtube-dl/issues/11800#issuecomment-275037127
 | 
			
		||||
            # http://trac.ffmpeg.org/ticket/6125#comment:10
 | 
			
		||||
            args += ['-seekable', '1' if seekable else '0']
 | 
			
		||||
 | 
			
		||||
@@ -334,7 +334,7 @@ class FFmpegFD(ExternalFD):
 | 
			
		||||
            # mp4 file couldn't be played, but if we ask ffmpeg to quit it
 | 
			
		||||
            # produces a file that is playable (this is mostly useful for live
 | 
			
		||||
            # streams). Note that Windows is not affected and produces playable
 | 
			
		||||
            # files (see https://github.com/rg3/youtube-dl/issues/8300).
 | 
			
		||||
            # files (see https://github.com/ytdl-org/youtube-dl/issues/8300).
 | 
			
		||||
            if sys.platform != 'win32':
 | 
			
		||||
                proc.communicate(b'q')
 | 
			
		||||
            raise
 | 
			
		||||
 
 | 
			
		||||
@@ -324,8 +324,8 @@ class F4mFD(FragmentFD):
 | 
			
		||||
        urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))
 | 
			
		||||
        man_url = urlh.geturl()
 | 
			
		||||
        # Some manifests may be malformed, e.g. prosiebensat1 generated manifests
 | 
			
		||||
        # (see https://github.com/rg3/youtube-dl/issues/6215#issuecomment-121704244
 | 
			
		||||
        # and https://github.com/rg3/youtube-dl/issues/7823)
 | 
			
		||||
        # (see https://github.com/ytdl-org/youtube-dl/issues/6215#issuecomment-121704244
 | 
			
		||||
        # and https://github.com/ytdl-org/youtube-dl/issues/7823)
 | 
			
		||||
        manifest = fix_xml_ampersands(urlh.read().decode('utf-8', 'ignore')).strip()
 | 
			
		||||
 | 
			
		||||
        doc = compat_etree_fromstring(manifest)
 | 
			
		||||
@@ -409,7 +409,7 @@ class F4mFD(FragmentFD):
 | 
			
		||||
                            # In tests, segments may be truncated, and thus
 | 
			
		||||
                            # FlvReader may not be able to parse the whole
 | 
			
		||||
                            # chunk. If so, write the segment as is
 | 
			
		||||
                            # See https://github.com/rg3/youtube-dl/issues/9214
 | 
			
		||||
                            # See https://github.com/ytdl-org/youtube-dl/issues/9214
 | 
			
		||||
                            dest_stream.write(down_data)
 | 
			
		||||
                            break
 | 
			
		||||
                        raise
 | 
			
		||||
 
 | 
			
		||||
@@ -152,8 +152,8 @@ class HlsFD(FragmentFD):
 | 
			
		||||
                        except compat_urllib_error.HTTPError as err:
 | 
			
		||||
                            # Unavailable (possibly temporary) fragments may be served.
 | 
			
		||||
                            # First we try to retry then either skip or abort.
 | 
			
		||||
                            # See https://github.com/rg3/youtube-dl/issues/10165,
 | 
			
		||||
                            # https://github.com/rg3/youtube-dl/issues/10448).
 | 
			
		||||
                            # See https://github.com/ytdl-org/youtube-dl/issues/10165,
 | 
			
		||||
                            # https://github.com/ytdl-org/youtube-dl/issues/10448).
 | 
			
		||||
                            count += 1
 | 
			
		||||
                            if count <= fragment_retries:
 | 
			
		||||
                                self.report_retry_fragment(err, frag_index, count, fragment_retries)
 | 
			
		||||
 
 | 
			
		||||
@@ -111,7 +111,7 @@ class HttpFD(FileDownloader):
 | 
			
		||||
                # to match the value of requested Range HTTP header. This is due to a webservers
 | 
			
		||||
                # that don't support resuming and serve a whole file with no Content-Range
 | 
			
		||||
                # set in response despite of requested Range (see
 | 
			
		||||
                # https://github.com/rg3/youtube-dl/issues/6057#issuecomment-126129799)
 | 
			
		||||
                # https://github.com/ytdl-org/youtube-dl/issues/6057#issuecomment-126129799)
 | 
			
		||||
                if has_range:
 | 
			
		||||
                    content_range = ctx.data.headers.get('Content-Range')
 | 
			
		||||
                    if content_range:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user