Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							693b8b2d31 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'dstftw/smotri.com-broadcast'  
						
						... 
						
						
						
						Conflicts:
	youtube_dl/FileDownloader.py
	youtube_dl/extractor/smotri.py 
						
						
					 
					
						2013-12-09 04:42:35 +01:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							4c52160646 
							
						 
					 
					
						
						
							
							[FileDownloader] Fix progress report on Windows ( Fixes   #1918 )  
						
						
						
						
					 
					
						2013-12-08 06:53:46 +01:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							a213880aaf 
							
						 
					 
					
						
						
							
							Simplify status reporting ( #1918 )  
						
						
						
						
					 
					
						2013-12-08 05:49:35 +01:00 
						 
				 
			
				
					
						
							
							
								dst 
							
						 
					 
					
						
						
						
						
							
						
						
							55f6597c67 
							
						 
					 
					
						
						
							
							[smotri] Add an extractor for live rtmp broadcasts  
						
						
						
						
					 
					
						2013-12-04 08:41:09 +07:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							d9b011f201 
							
						 
					 
					
						
						
							
							Fix rtmpdump with non-ASCII filenames on Windows on 2.x  
						
						... 
						
						
						
						Reported in #1798  
						
						
					 
					
						2013-11-25 22:31:38 +01:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							d0d2b49ab7 
							
						 
					 
					
						
						
							
							[FileDownloader] use moved format_bytes method  
						
						
						
						
					 
					
						2013-11-25 06:17:41 +01:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							31cb6d8fef 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'rzhxeo/rtmpdump'  
						
						
						
						
					 
					
						2013-11-25 06:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							02dbf93f0e 
							
						 
					 
					
						
						
							
							[zdf/common] Use API in ZDF extractor.  
						
						... 
						
						
						
						This also comes with a lot of extra format fields
Fixes  #1518  
						
						
					 
					
						2013-11-25 03:13:22 +01:00 
						 
				 
			
				
					
						
							
							
								rzhxeo 
							
						 
					 
					
						
						
						
						
							
						
						
							2b35c9ef74 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rtmpdump  
						
						... 
						
						
						
						Conflicts:
	youtube_dl/FileDownloader.py
Merge 
						
						
					 
					
						2013-11-18 00:27:06 +01:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							1e5b9a95fd 
							
						 
					 
					
						
						
							
							Move console_title to YoutubeDL  
						
						
						
						
					 
					
						2013-11-17 11:39:52 +01:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							801dbbdffd 
							
						 
					 
					
						
						
							
							Use avconv for downloading with m3u8 manifests if it's available ( fixes   #1735 )  
						
						
						
						
					 
					
						2013-11-10 16:47:03 +01:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							0ed05a1d2d 
							
						 
					 
					
						
						
							
							Use the 'rtmp_live'  field for the live parameter of rtmpdump  
						
						
						
						
					 
					
						2013-11-10 12:45:17 +01:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							1008bebade 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'rzhxeo/rtmpdump_live'  
						
						
						
						
					 
					
						2013-11-10 12:38:40 +01:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							be07375b66 
							
						 
					 
					
						
						
							
							Don't recode the video with m3u8 downloads ( fixes   #1741 )  
						
						
						
						
					 
					
						2013-11-09 16:40:00 +01:00 
						 
				 
			
				
					
						
							
							
								rzhxeo 
							
						 
					 
					
						
						
						
						
							
						
						
							4894fe8c5b 
							
						 
					 
					
						
						
							
							Report download progress of rtmpdump  
						
						
						
						
					 
					
						2013-11-09 11:14:40 +01:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							4ac5306ae7 
							
						 
					 
					
						
						
							
							Fix the report progress when file_size is unknown ( #1731 )  
						
						... 
						
						
						
						The report_progress function will accept eta and percent with None value and will set the message to 'Unknow ETA' or 'Unknown %'.
Otherwise the values must be numbers. 
						
						
					 
					
						2013-11-07 08:03:35 +01:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							50a886b7ab 
							
						 
					 
					
						
						
							
							Fix reporting when file size is unkown ( Fixes   #1731 )  
						
						
						
						
					 
					
						2013-11-06 14:02:33 +01:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							76e67c2cb6 
							
						 
					 
					
						
						
							
							Clean up imports  
						
						
						
						
					 
					
						2013-11-06 14:01:43 +01:00 
						 
				 
			
				
					
						
							
							
								rzhxeo 
							
						 
					 
					
						
						
						
						
							
						
						
							31366066bd 
							
						 
					 
					
						
						
							
							Add support for live parameter to rtmpdump  
						
						
						
						
					 
					
						2013-11-02 18:08:16 +01:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							9026dd3858 
							
						 
					 
					
						
						
							
							Make sure it only runs rtmpdump one time in test mode and return True if the download can be resumed  
						
						
						
						
					 
					
						2013-10-11 12:42:15 +02:00 
						 
				 
			
				
					
						
							
							
								rzhxeo 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4f824365 
							
						 
					 
					
						
						
							
							Remove test parameter from _download_with_rtmpdump  
						
						
						
						
					 
					
						2013-10-06 22:04:32 +02:00 
						 
				 
			
				
					
						
							
							
								rzhxeo 
							
						 
					 
					
						
						
						
						
							
						
						
							ad7a071ab6 
							
						 
					 
					
						
						
							
							Only download 1 sec. with rtmpdump in test mode  
						
						
						
						
					 
					
						2013-10-06 20:55:24 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							dd5d2eb03c 
							
						 
					 
					
						
						
							
							If the file is already downloaded include the size in the progress hook  
						
						
						
						
					 
					
						2013-09-22 23:39:30 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							4ae720042c 
							
						 
					 
					
						
						
							
							Include the eta and the speed in the progress hooks  
						
						... 
						
						
						
						Useful when listening to the progress hook, for example in a GUI. 
						
						
					 
					
						2013-09-22 23:31:39 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							061b2889a9 
							
						 
					 
					
						
						
							
							Fix the minutes part in FileDownloader.format_seconds ( fixed   #1397 )  
						
						... 
						
						
						
						It printed for the minutes the result of (seconds // 60) 
						
						
					 
					
						2013-09-09 10:38:54 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							af8bd6a82d 
							
						 
					 
					
						
						
							
							Show the time taken to download in the same format as the ETA  
						
						
						
						
					 
					
						2013-08-28 10:56:11 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							6d38616e67 
							
						 
					 
					
						
						
							
							Merge pull request  #1181  from h3xx/master  
						
						... 
						
						
						
						Add some verbosity when reporting finished downloads
Remove the mixed use of tabs and spaces for indentation. 
						
						
					 
					
						2013-08-28 10:54:07 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							6c3e6e88d3 
							
						 
					 
					
						
						
							
							Allow hours in ETA display ( Fixes   #1280 )  
						
						
						
						
					 
					
						2013-08-21 05:44:19 +02:00 
						 
				 
			
				
					
						
							
							
								Dan Church 
							
						 
					 
					
						
						
						
						
							
						
						
							968b5e0112 
							
						 
					 
					
						
						
							
							Add some verbosity when reporting finished downloads  
						
						... 
						
						
						
						For example:
    [download] Resuming download at byte 1868140
    [download] Destination: Entry #1-Bn59FJ4HrmU.flv
    [download] 100% of 3.27MiB in 4s
This format is meant to somewhat mirror the behavior of wget(1) when reporting finished downloads:
    100%[==================>] 54,836,682   788KB/s   in 74s
    2013-08-04 12:32:05 (728 KB/s) - 'google-chrome-stable_current_x86_64.rpm' saved [54836682/54836682] 
						
						
					 
					
						2013-08-04 12:45:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							b15d4f624f 
							
						 
					 
					
						
						
							
							Allow to download from m3u8 manifests with ffmpeg  
						
						... 
						
						
						
						They are detected by the extension of the url. 
						
						
					 
					
						2013-07-31 22:33:37 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							2e32528012 
							
						 
					 
					
						
						
							
							FileDownloader: fixed call to "report_error" of YoutubeDL  
						
						... 
						
						
						
						It was being called as "error" 
						
						
					 
					
						2013-06-26 16:32:47 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							8222d8de88 
							
						 
					 
					
						
						
							
							Split FileDownloader in two classes: FileDownloader and YoutubeDL  
						
						... 
						
						
						
						YoutubeDL is the class that coordinates everything
FileDownloader gets a filename and an info dict and downloads the video. 
						
						
					 
					
						2013-06-24 10:21:43 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							0824c28c8b 
							
						 
					 
					
						
						
							
							Remove mentions of old InfoExtractors module  
						
						
						
						
					 
					
						2013-06-23 22:42:59 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							3c25b9abae 
							
						 
					 
					
						
						
							
							Remove useless headers  
						
						
						
						
					 
					
						2013-06-23 20:35:50 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							bb47437686 
							
						 
					 
					
						
						
							
							Ignore invalid dates ( Fixes   #894 )  
						
						
						
						
					 
					
						2013-06-19 22:13:16 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							8cd252f115 
							
						 
					 
					
						
						
							
							Use long rtmpdump options  
						
						... 
						
						
						
						Note that we accidentally called rtmpdump with -v (--live) instead of -V (--verbose) because we missed this. 
						
						
					 
					
						2013-06-10 18:14:45 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							8027175600 
							
						 
					 
					
						
						
							
							Set the extractor key in playlists entries  
						
						... 
						
						
						
						If they were videos the extractor key wasn't being set anywhere else
Closes 877 
						
						
					 
					
						2013-06-08 12:08:44 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							3054ff0cbe 
							
						 
					 
					
						
						
							
							Merge pull request  #853  from mc2avr/master  
						
						... 
						
						
						
						add ZDFIE 
						
						
					 
					
						2013-06-08 11:44:01 +02:00 
						 
				 
			
				
					
						
							
							
								mc2avr 
							
						 
					 
					
						
						
						
						
							
						
						
							f2cd958c0a 
							
						 
					 
					
						
						
							
							add ZDFIE and _download_with_mplayer(mms://,rtsp://)  
						
						
						
						
					 
					
						2013-05-23 21:42:03 +02:00 
						 
				 
			
				
					
						
							
							
								Filippo Valsorda 
							
						 
					 
					
						
						
						
						
							
						
						
							f008688520 
							
						 
					 
					
						
						
							
							make rtmpdump inherit the verbose option for debugging  
						
						
						
						
					 
					
						2013-05-20 11:54:21 +02:00 
						 
				 
			
				
					
						
							
							
								mc2avr 
							
						 
					 
					
						
						
						
						
							
						
						
							de5d66d431 
							
						 
					 
					
						
						
							
							MyVideoIE: add rtmp support  
						
						
						
						
					 
					
						2013-05-15 23:38:44 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							7bdb17d4d5 
							
						 
					 
					
						
						
							
							Add extra_info argument to extract_info and process_ie_result  
						
						... 
						
						
						
						It allows to update the info_dicts with other values
(closes  #840 ) 
						
						
					 
					
						2013-05-14 14:40:40 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							1bd96c3a60 
							
						 
					 
					
						
						
							
							Deprecate --only-sub  
						
						
						
						
					 
					
						2013-05-13 09:06:18 +02:00 
						 
				 
			
				
					
						
							
							
								jakeogh 
							
						 
					 
					
						
						
						
						
							
						
						
							1a2adf3f49 
							
						 
					 
					
						
						
							
							added --get-id option to print video IDs  
						
						
						
						
					 
					
						2013-05-05 22:30:07 -07:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							b338f1b154 
							
						 
					 
					
						
						
							
							FileDownloader: Simplify and document  
						
						
						
						
					 
					
						2013-05-05 20:49:42 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							11d9224e3b 
							
						 
					 
					
						
						
							
							add --write-thumbnail option to download thumbnail (Suggested by `)  
						
						
						
						
					 
					
						2013-05-01 14:04:33 +02:00 
						 
				 
			
				
					
						
							
							
								Philipp Hagemeister 
							
						 
					 
					
						
						
						
						
							
						
						
							4ae9e55822 
							
						 
					 
					
						
						
							
							Correctly clear the line before writing a new status line  
						
						
						
						
					 
					
						2013-04-30 19:42:58 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							767e00277f 
							
						 
					 
					
						
						
							
							Use report_warning when a not working IE will be uses  
						
						
						
						
					 
					
						2013-04-28 17:12:07 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							bd55852517 
							
						 
					 
					
						
						
							
							Allow to select videos to download by their upload dates (related  #137 )  
						
						... 
						
						
						
						Only absolute dates. 
						
						
					 
					
						2013-04-27 14:01:55 +02:00 
						 
				 
			
				
					
						
							
							
								Jaime Marquínez Ferrándiz 
							
						 
					 
					
						
						
						
						
							
						
						
							613bf66939 
							
						 
					 
					
						
						
							
							More calls to trouble changed to report_error  
						
						
						
						
					 
					
						2013-04-23 11:31:37 +02:00