Michael Niedermayer
							
						 
					 | 
					
						
						
							
						
						59fdf543d5
					 | 
					
						
						
							
							smush: read subversion for version==1 too.
						
						
						
						
						
						
						
						This avoids a gcc warning, otherwise it should have no effect.
its a bit more consistent too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 | 
					
						2012-09-09 02:36:57 +02: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						30659a2233
					 | 
					
						
						
							
							smush: properly flag audio packets
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-07-08 20:49:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						3821632e1b
					 | 
					
						
						
							
							smush: set audio packet duration
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-06-21 12:14:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paul B Mahol
							
						 
					 | 
					
						
						
							
						
						bef8fd7099
					 | 
					
						
						
							
							LucasArts SMUSH demuxer
						
						
						
						
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 | 
					
						2012-06-21 02:27:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |