| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Paul B Mahol | 1b129c2abc | flashsv2enc: align codec declarations While here constify enums for .pix_fmts.
Signed-off-by: Paul B Mahol <onemda@gmail.com> | 2012-06-14 15:48:43 +00:00 |  | 
			
				
					| 
							
							
								 Carl Eugen Hoyos | db11fc5392 | Fix flashsv2 encoder error message. | 2012-05-12 13:11:56 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | 2a37ac042f | flashsv2enc: fix division by zero Fixes other half of Ticket1105
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2012-05-12 12:07:02 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | 40d8c89cb6 | flashsvenc: fix image sizes below 192x192 Fixes half of Ticket1105
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2012-05-12 12:06:37 +02:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | ae2c33b0c2 | cosmetics: remove superfluous curly brackets Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 03:09:07 +01:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | 3f35b66512 | flashv2enc: switch to ff_alloc_packet2() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 19:03:19 +01:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | 131698af55 | flashsv2enc: switch to encode2() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2012-02-24 03:30:42 +01:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | 7099f36578 | lavc: replace rest of deprecated FF_*_TYPE with AV_PICTURE_TYPE_* Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 03:25:22 +01:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | ba10207bbe | Use more designated initializers. Also remove some pointless NULL/0 assigments.
C++ code must be left as it is because named struct
initializers are not supported by C++ standard. | 2011-12-30 20:00:53 +01:00 |  | 
			
				
					| 
							
							
								 Clément Bœsch | 1912c215e0 | doxygen: remove a few @file parameters. It is not mandatory and prevents breakage on rename. | 2011-10-04 08:04:17 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | 4517ba092e | flashsv2enc:fix segfault Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2011-04-29 18:31:17 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | f0f3425311 | flashsv2enc: mark encoder experimental Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2011-04-29 03:06:06 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | c83a528193 | flashsv2enc: remove useless casts Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2011-04-29 02:43:12 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | ba9c4db59a | flashsv2enc: use av_freep() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2011-04-29 02:41:13 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | f6a5edb64c | flashsv2enc: remove useless if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2011-04-29 02:40:22 +02:00 |  | 
			
				
					| 
							
							
								 Joshua Warner | 3f6dc4a130 | encoder for adobe's flash ScreenVideo2 codec | 2011-04-29 02:35:59 +02:00 |  |