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 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							6b899e16de 
							
						 
					 
					
						
						
							
							lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h  
						
						
						
						
					 
					
						2011-05-27 12:15:09 +02:00 
						 
				 
			
				
					
						
							
							
								Brad 
							
						 
					 
					
						
						
						
						
							
						
						
							2eddfb2b13 
							
						 
					 
					
						
						
							
							sndio bug fix  
						
						... 
						
						
						
						Since the code already supports both little- and big-endian
audio for recording, do not fail just because the endianness is not
what we expect.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> 
						
						
					 
					
						2011-03-29 21:19:39 -07:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
						
						
							
						
						
							1862778732 
							
						 
					 
					
						
						
							
							sndio: allow any endianness when recording  
						
						... 
						
						
						
						Since the code already supports both little- and big-endian
audio for recording, do not fail just because the endianness is not
what we expect.
It is possible that 8-bit recording would not have worked at all on
some systems without that change. 
						
						
					 
					
						2011-03-29 20:21:47 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							e93d97156d 
							
						 
					 
					
						
						
							
							sndio: prefer "FFmpeg" over "Libav" in the license header  
						
						
						
						
					 
					
						2011-03-28 22:50:09 +02:00 
						 
				 
			
				
					
						
							
							
								Brad 
							
						 
					 
					
						
						
						
						
							
						
						
							15d59d2cea 
							
						 
					 
					
						
						
							
							sndio support for playback and record  
						
						... 
						
						
						
						Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 
					
						2011-03-27 10:46:45 +02:00