Andreas Rheinhardt 
							
						 
					 
					
						
						
						
						
							
						
						
							a5ee166327 
							
						 
					 
					
						
						
							
							avformat/avformat: Add AVStream parameter to check_bitstream() sig  
						
						... 
						
						
						
						For most check_bitstream() functions this just avoids having
to dereference s->streams[pkt->stream_index] themselves; but for
meta-muxers it will allow to forward the packet to stream with
a different stream_index (belonging to a different AVFormatContext)
without using a spare packet.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> 
						
						
					 
					
						2021-11-27 12:55:41 +01:00 
						 
				 
			
				
					
						
							
							
								Limin Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							38052757f5 
							
						 
					 
					
						
						
							
							avformat: add raw avs3 muxer  
						
						... 
						
						
						
						Signed-off-by: Limin Wang <lance.lmwang@gmail.com> 
						
						
					 
					
						2021-10-19 20:15:47 +08:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							8a6beccf0d 
							
						 
					 
					
						
						
							
							avformat: add an AV1 Low overhead bitstream format muxer  
						
						... 
						
						
						
						Suggested-by: BBB
Signed-off-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2021-09-01 19:55:30 -03:00 
						 
				 
			
				
					
						
							
							
								Andreas Rheinhardt 
							
						 
					 
					
						
						
						
						
							
						
						
							bc70684e74 
							
						 
					 
					
						
						
							
							avformat: Constify all muxer/demuxers  
						
						... 
						
						
						
						This is possible now that the next-API is gone.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2021-04-27 11:48:06 -03:00 
						 
				 
			
				
					
						
							
							
								Gyan Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							240aa70b79 
							
						 
					 
					
						
						
							
							avformat/rawenc: remove singlejpeg muxer  
						
						... 
						
						
						
						It was added in 51ac1f616f due to ticket #4218 , in order to show a single
image via ffserver. With ffserver long gone, it serves no purpose. 
						
						
					 
					
						2021-04-16 11:14:36 +05:30 
						 
				 
			
				
					
						
							
							
								Gyan Doshi 
							
						 
					 
					
						
						
						
						
							
						
						
							309e3cc15c 
							
						 
					 
					
						
						
							
							avformat/rawenc: perform stream checks for mp2 muxer  
						
						
						
						
					 
					
						2021-04-11 16:46:08 +05:30 
						 
				 
			
				
					
						
							
							
								Andreas Rheinhardt 
							
						 
					 
					
						
						
						
						
							
						
						
							9f1b808bde 
							
						 
					 
					
						
						
							
							avformat/rawenc: Use init instead of write_header function  
						
						... 
						
						
						
						force_one_stream() does not write anything.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 
						
						
					 
					
						2021-03-11 20:01:28 +01:00 
						 
				 
			
				
					
						
							
							
								Carl Eugen Hoyos 
							
						 
					 
					
						
						
						
						
							
						
						
							aef24efb0c 
							
						 
					 
					
						
						
							
							lavf/rawenc: Only accept the appropriate stream type for raw muxers.  
						
						... 
						
						
						
						This does not affect the rawvideo muxer.
Fixes ticket #7979 . 
						
						
					 
					
						2019-09-06 16:22:44 -03:00 
						 
				 
			
				
					
						
							
							
								hwren 
							
						 
					 
					
						
						
						
						
							
						
						
							ed0bd0a71b 
							
						 
					 
					
						
						
							
							lavf: add raw avs2 muxer  
						
						... 
						
						
						
						Signed-off-by: hwren <hwrenx@126.com> 
						
						
					 
					
						2018-09-11 21:48:49 +01:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
						
						
							
						
						
							88508a87a5 
							
						 
					 
					
						
						
							
							sbc: add raw muxer for SBC  
						
						
						
						
					 
					
						2018-03-07 22:26:53 +01:00 
						 
				 
			
				
					
						
							
							
								Tomas Härdin 
							
						 
					 
					
						
						
						
						
							
						
						
							5655048c73 
							
						 
					 
					
						
						
							
							Add muxer/demuxer for raw codec2 and .c2 files  
						
						
						
						
					 
					
						2018-02-24 17:06:31 +01:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
						
						
							
						
						
							d8258489c8 
							
						 
					 
					
						
						
							
							aptx: add raw muxer and demuxer for aptX HD  
						
						
						
						
					 
					
						2018-02-09 22:10:55 +01:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
						
						
							
						
						
							018eef1a1b 
							
						 
					 
					
						
						
							
							aptx: add raw muxer and demuxer for aptX  
						
						
						
						
					 
					
						2017-11-10 21:32:06 +00:00 
						 
				 
			
				
					
						
							
							
								Carl Eugen Hoyos 
							
						 
					 
					
						
						
						
						
							
						
						
							9d494c5e55 
							
						 
					 
					
						
						
							
							lavf/rawenc: Add little- and big-endian G.726 muxers.  
						
						
						
						
					 
					
						2017-08-26 11:43:09 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							4de591e6fb 
							
						 
					 
					
						
						
							
							Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'  
						
						... 
						
						
						
						* commit '83548fe894cdb455cc127f754d09905b6d23c173':
  lavf: fix usage of AVIOContext.seekable
Merged-by: James Almer <jamrial@gmail.com> 
						
						
					 
					
						2017-03-21 17:02:30 -03:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							a0bc6b51d4 
							
						 
					 
					
						
						
							
							Merge commit 'e72d6fa08a3c1876109149401753a8d2c736d418'  
						
						... 
						
						
						
						* commit 'e72d6fa08a3c1876109149401753a8d2c736d418':
  build: Move MP2 muxer declaration away from MP3 muxer code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 
					
						2016-11-14 11:20:15 +01:00 
						 
				 
			
				
					
						
							
							
								Rodger Combs 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d99d7cbdfc 
							
						 
					 
					
						
						
							
							lavf/rawenc: add automatic bitstream filtering for H264+HEVC  
						
						
						
						
					 
					
						2016-10-24 03:53:24 -05:00 
						 
				 
			
				
					
						
							
							
								Mark Reid 
							
						 
					 
					
						
						
						
						
							
						
						
							541731488e 
							
						 
					 
					
						
						
							
							libavformat/rawenc: add dnxhr raw format extension  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-07-21 04:15:15 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							e72d6fa08a 
							
						 
					 
					
						
						
							
							build: Move MP2 muxer declaration away from MP3 muxer code  
						
						... 
						
						
						
						The MP2 muxer uses none of the code of the MP3 muxer. 
						
						
					 
					
						2016-06-29 20:24:10 +02:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
						
						
							
						
						
							6f69f7a8bf 
							
						 
					 
					
						
						
							
							Merge commit '9200514ad8717c63f82101dc394f4378854325bf'  
						
						... 
						
						
						
						* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2016-04-10 20:59:55 +01:00 
						 
				 
			
				
					
						
							
							
								Carl Eugen Hoyos 
							
						 
					 
					
						
						
						
						
							
						
						
							b0c026a27f 
							
						 
					 
					
						
						
							
							lavf/rawenc: Add a raw gsm muxer.  
						
						
						
						
					 
					
						2016-04-09 11:44:50 +02:00 
						 
				 
			
				
					
						
							
							
								Rostislav Pehlivanov 
							
						 
					 
					
						
						
						
						
							
						
						
							135460383e 
							
						 
					 
					
						
						
							
							avformat: add vc2 as an allowed rawenc Dirac extension  
						
						... 
						
						
						
						Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> 
						
						
					 
					
						2016-02-10 17:15:59 +00:00 
						 
				 
			
				
					
						
							
							
								Mohamed Naufal 
							
						 
					 
					
						
						
						
						
							
						
						
							ca5f386e75 
							
						 
					 
					
						
						
							
							lavf: G.723.1 muxer  
						
						... 
						
						
						
						Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> 
						
						
					 
					
						2015-11-30 10:58:46 -05:00 
						 
				 
			
				
					
						
							
							
								Carl Eugen Hoyos 
							
						 
					 
					
						
						
						
						
							
						
						
							66378f70ab 
							
						 
					 
					
						
						
							
							lavf/rawenc: Recognize more extensions to encode raw hevc.  
						
						... 
						
						
						
						Requested-by: Mike Brown, brown at mrvideo vidiot com 
						
						
					 
					
						2015-11-24 02:17:54 +01:00 
						 
				 
			
				
					
						
							
							
								Carl Eugen Hoyos 
							
						 
					 
					
						
						
						
						
							
						
						
							98ed0716fb 
							
						 
					 
					
						
						
							
							lavf/rawenc: Force one stream for hevc and m4v.  
						
						
						
						
					 
					
						2015-09-29 21:36:18 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							6c8a05268c 
							
						 
					 
					
						
						
							
							avformat/rawenc: Store sample number for ADX  
						
						... 
						
						
						
						Fixes Ticket4540
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-06-21 12:16:24 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
						
						
							
						
						
							4aebaed0e1 
							
						 
					 
					
						
						
							
							avformat/singlejpeg: fix standalone compilation  
						
						
						
						
					 
					
						2015-06-13 17:47:13 -03:00 
						 
				 
			
				
					
						
							
							
								Caligula useraccount 
							
						 
					 
					
						
						
						
						
							
						
						
							51ac1f616f 
							
						 
					 
					
						
						
							
							avformat: Add single jpeg muxer  
						
						... 
						
						
						
						Needed to fix Ticket4218
Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-06-08 03:36:22 +02:00 
						 
				 
			
				
					
						
							
							
								Werner Robitza 
							
						 
					 
					
						
						
						
						
							
						
						
							4b46ce8e91 
							
						 
					 
					
						
						
							
							avformat: allow .264 as extension for raw H.264 stream  
						
						... 
						
						
						
						In addition to .h264, .264 is also commonly used by people to name raw H.264
streams. Enables automatic recognition of the h264 format for the .264
extension.
Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-01-22 23:13:08 +01:00 
						 
				 
			
				
					
						
							
							
								Florent Le Coz 
							
						 
					 
					
						
						
						
						
							
						
						
							2e0935965b 
							
						 
					 
					
						
						
							
							Drop the unofficial extension prefix for MPEG and MPEG-TS formats  
						
						... 
						
						
						
						As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38 
http://tools.ietf.org/html/rfc3003 
CC: libav-stable@libav.org  
						
						
					 
					
						2014-12-02 15:28:22 +00:00 
						 
				 
			
				
					
						
							
							
								Florent Le Coz 
							
						 
					 
					
						
						
						
						
							
						
						
							fdcb2873e1 
							
						 
					 
					
						
						
							
							Fix the mime types for MPEG and MPEG-TS formats  
						
						... 
						
						
						
						As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38 
http://tools.ietf.org/html/rfc3003  
						
						
					 
					
						2014-05-22 23:34:59 +02:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
						
						
							
						
						
							ef5d32b9c5 
							
						 
					 
					
						
						
							
							Add raw HEVC muxer  
						
						... 
						
						
						
						Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2014-02-09 14:29:07 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Buitenhuis 
							
						 
					 
					
						
						
						
						
							
						
						
							722554788b 
							
						 
					 
					
						
						
							
							Add raw HEVC muxer  
						
						... 
						
						
						
						Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2014-02-09 14:15:44 +00:00 
						 
				 
			
				
					
						
							
							
								Carl Eugen Hoyos 
							
						 
					 
					
						
						
						
						
							
						
						
							945a440d11 
							
						 
					 
					
						
						
							
							Force one stream for raw muxers.  
						
						... 
						
						
						
						Based on eeb975f5
Fixes ticket #3217 .
Reviewed-by: Nicolas George 
						
						
					 
					
						2013-12-11 13:15:49 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7308439158 
							
						 
					 
					
						
						
							
							lavf: Don't explicitly flush after each written packet in muxers  
						
						... 
						
						
						
						Since 596e5d4783, this is not necessary anymore. It also allows to
actually disable the flushing, improving write performance (but
possibly giving worse latency in real-time streaming).
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2013-09-16 22:17:33 +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 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8de9bb6e5e 
							
						 
					 
					
						
						
							
							lavf: remove some flushing in write_packet muxers callbacks.  
						
						... 
						
						
						
						Since 4f112a8e3, this is not necessary anymore. Also, it allows to
actually disable the flushing. 
						
						
					 
					
						2013-04-14 21:16:53 +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 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							168a7f06de 
							
						 
					 
					
						
						
							
							rawenc: cosmetics: reindent  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-11-21 15:34:45 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							7a72695c05 
							
						 
					 
					
						
						
							
							Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'  
						
						... 
						
						
						
						* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.
Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-08-07 22:45:46 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							36ef5369ee 
							
						 
					 
					
						
						
							
							Replace all CODEC_ID_* with AV_CODEC_ID_*  
						
						
						
						
					 
					
						2012-08-07 16:00:24 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							d1dad7c824 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  mpc8: return more meaningful error codes.
  mpc: return more meaningful error codes.
  wv,mpc8: don't return apetag data in packets.
  rtmp: do not warn about receiving metadata packets
  x86: h264dsp: Adjust YASM #ifdefs
  x86: yadif: Mark mmxext optimizations as such
  h264: convert loop filter strength dsp function to yasm.
  Improve descriptiveness of a number of codec and container long names
Conflicts:
	libavcodec/flvdec.c
	libavcodec/libopenjpegdec.c
	libavformat/apetag.c
	libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-07-31 22:41:00 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							b5da7d4c1a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  avformat: Drop pointless "format" from container long names
  swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
  wv: K&R formatting cosmetics
  configure: Add missing descriptions to help output
  h264_ps: declare array of colorspace strings on its own line.
  fate: amix: specify f32 sample format for comparison
  tiny_psnr: support 32-bit float samples
  eamad/eatgq/eatqi: call special EA IDCT directly
  eamad: remove use of MpegEncContext
  mpegvideo: remove unnecessary inclusions of faandct.h
  af_asyncts: avoid overflow in out_size with large delta values
  af_asyncts: add first_pts option
Conflicts:
	configure
	libavcodec/eamad.c
	libavcodec/h264_ps.c
	libavformat/crcenc.c
	libavformat/ffmdec.c
	libavformat/ffmenc.c
	libavformat/framecrcenc.c
	libavformat/md5enc.c
	libavformat/nutdec.c
	libavformat/rawenc.c
	libavformat/yuv4mpeg.c
	tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-07-30 23:28:31 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							0177b7d23a 
							
						 
					 
					
						
						
							
							Improve descriptiveness of a number of codec and container long names  
						
						
						
						
					 
					
						2012-07-30 20:46:55 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							6774247a9d 
							
						 
					 
					
						
						
							
							avformat: Drop pointless "format" from container long names  
						
						
						
						
					 
					
						2012-07-30 13:59:06 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							9e63c30daa 
							
						 
					 
					
						
						
							
							lavf: add a real SRT muxer.  
						
						... 
						
						
						
						This muxer supports CODEC_ID_SRT with the timestamps in the packet data
and CODEC_ID_TEXT with the timestamps in the packet fields.
Makes -scodec copy work from Matroska. 
						
						
					 
					
						2012-06-21 20:52:56 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ca19862d38 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  libxvid: remove disabled code
  qdm2: make a table static const
  qdm2: simplify bitstream reader setup for some subpacket types
  qdm2: use get_bits_left()
  build: Consistently handle conditional compilation for all optimization OBJS.
  avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
  msrle: convert MS RLE decoding function to bytestream2.
  x86inc improvements for 64-bit
Conflicts:
	common.mak
	libavcodec/avpacket.c
	libavcodec/bfi.c
	libavcodec/msrledec.c
	libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-13 00:39:19 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							2ef15b46e4 
							
						 
					 
					
						
						
							
							avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics  
						
						
						
						
					 
					
						2012-04-12 09:00:49 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							2e0c360abd 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  cosmetics: Align muxer/demuxer declarations
  mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
  avcodec: remove avcodec_guess_channel_layout()
  avutil: Add av_get_default_channel_layout()
Conflicts:
	doc/APIchanges
	libavcodec/mpeg12.c
	libavformat/cdg.c
	libavformat/matroskaenc.c
	libavformat/mpegts.c
	libavformat/nuv.c
	libavformat/wav.c
	libavutil/audioconvert.c
	libavutil/audioconvert.h
	libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-04-06 22:52:01 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							20234a4bd7 
							
						 
					 
					
						
						
							
							cosmetics: Align muxer/demuxer declarations  
						
						... 
						
						
						
						Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2012-04-06 19:19:59 +03:00