Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							8d06ce7941 
							
						 
					 
					
						
						
							
							Merge commit '605387582bd35920b83a26dabbe1c0601f425621'  
						
						... 
						
						
						
						* commit '605387582bd35920b83a26dabbe1c0601f425621':
  lavf: Support unix sockets
Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-08-06 15:33:12 +02:00 
						 
				 
			
				
					
						
							
							
								Luca Barbato 
							
						 
					 
					
						
						
						
						
							
						
						
							605387582b 
							
						 
					 
					
						
						
							
							lavf: Support unix sockets  
						
						
						
						
					 
					
						2013-08-05 16:13:35 +02:00 
						 
				 
			
				
					
						
							
							
								wm4 
							
						 
					 
					
						
						
						
						
							
						
						
							c3316ddb83 
							
						 
					 
					
						
						
							
							lavf: add support for libgme  
						
						... 
						
						
						
						Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-07-02 18:52:45 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Heaney 
							
						 
					 
					
						
						
						
						
							
						
						
							b24f15c45e 
							
						 
					 
					
						
						
							
							lavf: add WebVTT muxer.  
						
						... 
						
						
						
						This revision creates a WebVTT muxer, that outputs files having the
format described in the following specification:
http://dev.w3.org/html5/webvtt/  
						
						
					 
					
						2013-06-17 22:28:19 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							716dbc7e13 
							
						 
					 
					
						
						
							
							lavf/allformats: align nit for tee muxer.  
						
						
						
						
					 
					
						2013-06-01 02:36:07 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							2d2d6a4883 
							
						 
					 
					
						
						
							
							lavf: add a raw WavPack muxer.  
						
						
						
						
					 
					
						2013-05-28 18:19:19 +02:00 
						 
				 
			
				
					
						
							
							
								Lukasz Marek 
							
						 
					 
					
						
						
						
						
							
						
						
							c86d3a54de 
							
						 
					 
					
						
						
							
							FTP protocol support  
						
						... 
						
						
						
						Implementation of ftp protocol.
Fixes  #1672 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-18 22:16:02 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							e5e86db178 
							
						 
					 
					
						
						
							
							RedSpark demuxer  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2013-05-10 16:53:02 -03:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							d3710c51d9 
							
						 
					 
					
						
						
							
							RSD demuxer  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2013-05-10 16:52:10 -03:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							b4866f717c 
							
						 
					 
					
						
						
							
							ADP demuxer  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2013-05-10 16:10:52 -03:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							276fcbde6c 
							
						 
					 
					
						
						
							
							lavf: data muxer and demuxer.  
						
						... 
						
						
						
						Allow to use tools designed to work with demuxers, muxers
and packets (for example ffmpeg itself) to process raw byte
streams (like aviocat). 
						
						
					 
					
						2013-05-01 11:56:34 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0fb64da63f 
							
						 
					 
					
						
						
							
							avformat: Add black ops audio demuxer  
						
						... 
						
						
						
						Fixes Ticket2064
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-28 04:21:29 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2a7f885fe1 
							
						 
					 
					
						
						
							
							lavf: add libquvi demuxer.  
						
						
						
						
					 
					
						2013-04-10 12:09:20 +02:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
						
						
							
						
						
							e4e4add0e3 
							
						 
					 
					
						
						
							
							Add raw VC-1 muxer to match demuxer.  
						
						... 
						
						
						
						This is admittedly kind of pointless since usually -f image2pipe
can be used for the purpose, but this is more user-friendly.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> 
						
						
					 
					
						2013-03-16 13:42:53 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							1c60956c80 
							
						 
					 
					
						
						
							
							Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'  
						
						... 
						
						
						
						* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
  lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft
Conflicts:
	libavformat/allformats.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-03-13 12:21:43 +01:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							c7e044c61b 
							
						 
					 
					
						
						
							
							lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft  
						
						
						
						
					 
					
						2013-03-11 18:22:54 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							f43d09cd60 
							
						 
					 
					
						
						
							
							lavf: add tee pseudo-muxer.  
						
						
						
						
					 
					
						2013-02-09 20:50:11 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							b52925d2cd 
							
						 
					 
					
						
						
							
							Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'  
						
						... 
						
						
						
						* commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05':
  lavf: Add a protocol for SRTP encryption/decryption
  rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)
Conflicts:
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-15 16:05:34 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							2f3bada63e 
							
						 
					 
					
						
						
							
							lavf: Add a protocol for SRTP encryption/decryption  
						
						... 
						
						
						
						This is mostly useful for encryption together with the RTP muxer,
but could also be set up as IO towards the peer with the SDP
demuxer with custom IO.
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2013-01-15 11:55:10 +02:00 
						 
				 
			
				
					
						
							
							
								Peter Ross 
							
						 
					 
					
						
						
						
						
							
						
						
							3d0994be2f 
							
						 
					 
					
						
						
							
							Megalux Frame demuxer  
						
						
						
						
					 
					
						2013-01-06 13:58:15 +11:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cf1a9c89 
							
						 
					 
					
						
						
							
							Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'  
						
						... 
						
						
						
						* commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8':
  aviobuf: Partial support for reading in read/write contexts
  build: Avoid detecting bogus components named 'x'
Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavformat/allformats.c
	libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-04 13:01:54 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3048fae63c 
							
						 
					 
					
						
						
							
							build: Avoid detecting bogus components named 'x'  
						
						... 
						
						
						
						The function find_things() in configure is confused by component
registration calls as part of multiline macros defining combined
component registration.  Coalesce those macros into one line to
work around the issue.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2013-01-03 15:11:25 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							ecda1d3cbe 
							
						 
					 
					
						
						
							
							lavf: add data: URI scheme.  
						
						
						
						
					 
					
						2013-01-01 19:29:04 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							9a74282644 
							
						 
					 
					
						
						
							
							Sony Wave64 muxer  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-12-31 07:10:57 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							faa94061dd 
							
						 
					 
					
						
						
							
							Add SubViewer v1 subtitles demuxer and decoder.  
						
						
						
						
					 
					
						2012-12-31 00:01:58 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b43402724 
							
						 
					 
					
						
						
							
							Add PJS subtitles demuxer and decoder.  
						
						
						
						
					 
					
						2012-12-30 23:55:28 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1e4e352a6 
							
						 
					 
					
						
						
							
							Add AQTitle subtitles demuxer.  
						
						
						
						
					 
					
						2012-12-30 23:37:14 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							725d6c615c 
							
						 
					 
					
						
						
							
							Add MPlayer subtitles demuxer.  
						
						
						
						
					 
					
						2012-12-30 23:09:49 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c68aae908 
							
						 
					 
					
						
						
							
							Add VPlayer subtitles demuxer and decoder.  
						
						... 
						
						
						
						Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit. 
						
						
					 
					
						2012-12-30 22:46:42 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5f02844c8d 
							
						 
					 
					
						
						
							
							Add MPL2 subtitles demuxer and decoder.  
						
						
						
						
					 
					
						2012-12-30 22:37:25 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							613001d75f 
							
						 
					 
					
						
						
							
							Merge back some registering macros in all*.c.  
						
						... 
						
						
						
						This breaks the sed in configure:find_things(). Fixes regression from
c73c87b. Fixes Ticket2079.
Found-by: jamal 
						
						
					 
					
						2012-12-30 07:18:21 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							83d4a8442c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  cosmetics: Prettyprint codec/format/filter registration files
Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavfilter/allfilters.c
	libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-12-29 14:27:38 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							c73c87b412 
							
						 
					 
					
						
						
							
							cosmetics: Prettyprint codec/format/filter registration files  
						
						
						
						
					 
					
						2012-12-28 19:18:13 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							4f5440adc2 
							
						 
					 
					
						
						
							
							NIST SPHERE demuxer  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-12-23 21:22:43 +00:00 
						 
				 
			
				
					
						
							
							
								Peter Ross 
							
						 
					 
					
						
						
						
						
							
						
						
							6fb40779cd 
							
						 
					 
					
						
						
							
							Silicon Graphics Movie (.mv) demuxer  
						
						... 
						
						
						
						Signed-off-by: Peter Ross <pross@xvid.org> 
						
						
					 
					
						2012-12-17 20:37:54 +11:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							160013736e 
							
						 
					 
					
						
						
							
							lavf: TED Talks JSON captions demuxer.  
						
						
						
						
					 
					
						2012-12-09 18:50:38 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							57231e4d5b 
							
						 
					 
					
						
						
							
							tak: demuxer, parser, and decoder  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> 
						
						
					 
					
						2012-12-07 16:15:02 -05:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							710c4baf52 
							
						 
					 
					
						
						
							
							lavf: VobSub demuxer.  
						
						
						
						
					 
					
						2012-12-07 21:18:06 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							32aedebdc5 
							
						 
					 
					
						
						
							
							lavf: add a concat demuxer.  
						
						
						
						
					 
					
						2012-12-06 14:09:14 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							4c18562d02 
							
						 
					 
					
						
						
							
							Ensoniq Paris Audio File demuxer  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-12-05 13:01:22 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							880191637f 
							
						 
					 
					
						
						
							
							IRCAM demuxer & muxer  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-12-05 13:01:22 +00:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							b70251c0ad 
							
						 
					 
					
						
						
							
							AST Muxer  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2012-12-04 11:25:46 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							56e149fda9 
							
						 
					 
					
						
						
							
							PVF demuxer  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-12-01 21:02:45 +00:00 
						 
				 
			
				
					
						
							
							
								Vitaliy E Sugrobov 
							
						 
					 
					
						
						
						
						
							
						
						
							5603b2bf6e 
							
						 
					 
					
						
						
							
							Gif demuxer  
						
						... 
						
						
						
						Gif demuxer is capable of extracting multiple frames from gif file.
In conjunction with gif decoder it implements support for reading
animated gifs.
Demuxer has two options available to user: default_delay and min_delay.
These options are for protection from too rapid gif animations. In practice
it is standard approach to slow down rendering of this kind of gifs. If you try to
play gif with delay between frames of one hundredth of second (100fps) using
one of major web browsers, you get significantly slower playback,
around 10 fps. This is because browser detects that delay value is less than some
threshold (usually 2 hundredths of second) and reset it to default value (usually 10
hundredths of second, which corresponds to 10fps). Manipulating these options user
can achieve the same effect during conversion to some video format. Otherwise user
can set them to not protect from rapid animations at all.
The other case when these options necessary is for gif images encoded according to
gif87a standard since prior to gif89a there was no delay information included in file.
Bump lavf minor version.
Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com> 
						
						
					 
					
						2012-11-30 14:33:58 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							9a31997938 
							
						 
					 
					
						
						
							
							BRSTM demuxer  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-11-29 19:04:35 +00:00 
						 
				 
			
				
					
						
							
							
								Daniel Verkamp 
							
						 
					 
					
						
						
						
						
							
						
						
							a0958949eb 
							
						 
					 
					
						
						
							
							Vivo demuxer  
						
						
						
						
					 
					
						2012-11-28 20:13:05 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							51d6879939 
							
						 
					 
					
						
						
							
							AFC demuxer  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-11-27 10:17:28 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							57d7e21c34 
							
						 
					 
					
						
						
							
							lavf: move libmodplug registration with the other ext lib.  
						
						... 
						
						
						
						Also remove the duplicated #if. 
						
						
					 
					
						2012-11-21 08:00:35 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							461ecea068 
							
						 
					 
					
						
						
							
							AST demuxer  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-11-17 19:30:08 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e13d5e9a4b 
							
						 
					 
					
						
						
							
							Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'  
						
						... 
						
						
						
						* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter
Conflicts:
	doc/muxers.texi
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/mpegvideo_enc.c
	libavcodec/tiffenc.c
	libavformat/Makefile
	libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-11-14 11:59:20 +01:00