| 
							
							
								 James Almer | d34ec64a22 | replace calls to url_feof() with avio_feof() Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 00:48:38 +02:00 |  | 
			
				
					| 
							
							
								 Michael Niedermayer | 5297003aa7 | Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' * commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
  LucasArts SMUSH demuxer
Conflicts:
	Changelog
	doc/general.texi
	libavformat/smush.c
	libavformat/version.h
See: bef8fd7099edfac9c487e6eb75d7e6116ad80465
Merged-by: Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:29:47 +02:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | eeadcdfd1a | LucasArts SMUSH demuxer Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-06 16:41:41 +02:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | a807c68253 | avformat: use ff_alloc_extradata() Signed-off-by: Paul B Mahol <onemda@gmail.com> | 2013-10-13 20:13:38 +00:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | d98364edce | smush: check audio packet size Fixes null pointer dereference.
Signed-off-by: Paul B Mahol <onemda@gmail.com> | 2012-11-17 19:58:54 +00:00 |  | 
			
				
					| 
							
							
								 Paul B Mahol | c4dd4f19f3 | smush: improve probing Signed-off-by: Paul B Mahol <onemda@gmail.com> | 2012-11-04 16:50:58 +00:00 |  | 
			
				
					| 
							
							
								 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 |  |