ffmpeg

Author	SHA1	Message	Date
James Almer	974ac57e83	astenc: Remove two AVRationals with denominator 1 They are completely superfluous when using av_rescale_q_rnd(). Call av_rescale_rnd() using what used to be the numerators instead. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-20 05:05:55 +01:00
Paul B Mahol	76877beada	au: return meaningful error codes Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-19 20:16:35 +00:00
Paul B Mahol	d85854b269	pvfdec: drop pointless casting of buffer in ff_get_line() Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-19 15:55:39 +00:00
Janne Grunau	bb2bab92e7	mov: handle h263 and flv1 for codec_tag 'H','2','6','3' The sample in https://bugzilla.libav.org/show_bug.cgi?id=393 and samples/F4V/H263_NM_f.mp4 both have codec_tag H263 for different codecs. H263 is apparently used by Flash Media Server for Sorensen Spark videos. Patch based on commit `5442083b1c` by Carl Eugen Hoyos. Fixes bug 393.	2012-12-19 14:50:14 +01:00
Michael Niedermayer	af804dbe9e	Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534' * commit '523c7bd23c781aa0f3a85044896f5e18e8b52534': misc typo, style and wording fixes Conflicts: libavcodec/options_table.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-19 14:28:58 +01:00
Michael Niedermayer	1166fc07a2	utils: fix duration calculation for strange_duration_example.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-19 04:16:15 +01:00
Carl Eugen Hoyos	d687b8c875	Cosmetics: Reindent after last commit.	2012-12-18 23:06:00 +01:00
Carl Eugen Hoyos	00a62e6776	Do not skip three bytes and don't search for extradata in old realaudio files. Fixes ticket #1557.	2012-12-18 23:04:19 +01:00
Michael Niedermayer	94ecbe23c5	Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a' * commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a': au: Reorder code so that both muxer and demuxer are under #ifdefs fate: Move RALF test into lossless audio group cosmetics: Use consistent names for multiple inclusion guards. Conflicts: libavformat/au.c tests/fate/lossless-audio.mak tests/fate/real.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-18 14:27:59 +01:00
Peter Ross	95015634f5	wtv: permit root table and first sectors to be located beyond 2GB boundary Fixes ticket #2025. Signed-off-by: Peter Ross <pross@xvid.org>	2012-12-19 00:18:17 +11:00
Michael Niedermayer	ebfb738fa4	nutdec: sanity check r_frame_rate This fixes files that store a somewhat incorrect value. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-18 14:03:04 +01:00
Diego Biurrun	523c7bd23c	misc typo, style and wording fixes	2012-12-18 13:36:51 +01:00
Clément Bœsch	8b63744f48	Fix "bistream" typo and add a check in tools/patcheck.	2012-12-18 02:47:34 +01:00
Michael Niedermayer	1d29624c73	oggparsevorbis: check channels Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-17 20:51:50 +01:00
Jernej Virag	2f7465b5bf	SAP muxer set session name from metadata Pass "title" metadata field to av_sdp_create (as in RTP muxer) in SAP muxer for correct session name in SAP SDP announcements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-17 17:31:55 +01:00
Michael Niedermayer	8976ef7aec	concatdec: change data type to suppress warning about limited range of data type on some platforms. Reviewed-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-17 17:31:34 +01:00
Derek Buitenhuis	26e4f0c70f	doxy: Clarify what avpriv_set_pts_info does The "pts for a given stream" was nonsensical. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>	2012-12-17 11:20:00 -05:00
Derek Buitenhuis	df0d6735b3	doxy: Clarify what avpriv_set_pts_info does The "pts for a given stream" was nonsensical. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>	2012-12-17 11:18:27 -05:00
Diego Biurrun	c35f0e8495	au: Reorder code so that both muxer and demuxer are under #ifdefs This reduces code size when either piece has been disabled.	2012-12-17 17:02:22 +01:00
Diego Biurrun	81c7c817a4	cosmetics: Use consistent names for multiple inclusion guards.	2012-12-17 17:02:22 +01:00
Michael Niedermayer	8d07bbca63	Merge commit 'f322b2073581119de5da74f92a03309a36891cfa' * commit 'f322b2073581119de5da74f92a03309a36891cfa': lavr: only save/restore the mixing matrix if mixing is being done rtpdec_vp8: Cosmetics: Fix bad alignment/indentation rtpenc: Allow including a SDES/CNAME block in RTCP SR packets Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-17 14:06:11 +01:00
Michael Niedermayer	021b3497e1	Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8' * commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8': rtpenc_vp8: Include the picture number in VP8 packets Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-17 13:46:54 +01:00
Piotr Bandurski	0f450ac575	siff: set duration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-17 13:34:30 +01:00
Peter Ross	fb9d58509c	isom: support SGI RLE 8-bit in QuickTime file format Signed-off-by: Peter Ross <pross@xvid.org>	2012-12-17 20:37:54 +11:00
Peter Ross	6fb40779cd	Silicon Graphics Movie (.mv) demuxer Signed-off-by: Peter Ross <pross@xvid.org>	2012-12-17 20:37:54 +11:00
Michael Niedermayer	2e59142fa9	sctp: dont abort on invalid input Fixes Ticket1865 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-17 01:53:35 +01:00
Martin Storsjö	e798085f96	rtpdec_vp8: Cosmetics: Fix bad alignment/indentation Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-16 21:33:20 +02:00
Martin Storsjö	3b2e8d1d21	rtpenc: Allow including a SDES/CNAME block in RTCP SR packets Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-16 21:32:58 +02:00
Martin Storsjö	65e053271a	rtpenc_vp8: Include the picture number in VP8 packets This makes it easier for receivers to decide what to do if data is lost. Refactor calculating the max payload size, to avoid hardcoding the header size in too many places, reducing the number of lines that have to be touched if the header is adjusted further. Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-16 21:32:13 +02:00
Piotr Bandurski	cb8163d0bd	bfi: set duration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-16 16:53:01 +01:00
Michael Niedermayer	de89dff8da	brstm: ask for samples for version != 1.0 This also avoids 2 unused variable warnings. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-16 15:05:31 +01:00
Paul B Mahol	5be38f9421	brstm: add missing new line to request for sample messages Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-16 13:04:17 +00:00
Paul B Mahol	1081d78746	build: fix idf demuxer dependency Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-16 12:00:23 +00:00
Piotr Bandurski	5648069270	aiff: support in24/in32 tags Supported by QuickTime, libaudiofile and Csound.	2012-12-16 10:41:00 +00:00
James Almer	7959c26fb0	brstm: fix number of samples for the last block Signed-off-by: James Almer <jamrial@gmail.com>	2012-12-16 10:34:33 +00:00
Piotr Bandurski	d0bdcbcb28	thp: set duration	2012-12-16 10:27:54 +00:00
Michael Niedermayer	1e901ffc61	wrap_timestamp: remove unneeded check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-16 01:07:53 +01:00
Michael Niedermayer	1662bd350a	lavf: fix integer overflows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-16 01:05:36 +01:00
Harald Axmann	2d74dea84f	lavf: Provide a monotonic timestamp to the outside world Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-15 21:28:45 +01:00
Stefano Sabatini	ecebf6fc82	lavf/segment: provide more debug feedback when a new segment starts	2012-12-14 18:19:47 +01:00
Stefano Sabatini	df5f9496e6	lavf/segment: add missing flags to segmenter option constants	2012-12-14 18:19:47 +01:00
Michael Niedermayer	b2c2589ecf	westwood_vqa: fix null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-14 17:55:57 +01:00
Peter Ross	5c78a8129c	sauce: test filetype correctly for datatype 5 (binary text)	2012-12-14 16:46:29 +11:00
Björn Axelsson	2947e7b7a7	flvenc: don't write random data if seek fails The FLV muxer tries to update the header in write_trailer, which is impossible if writing to a pipe or network stream. Don't write header data if seek to header fails. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-13 21:54:35 +01:00
Stefano Sabatini	ddf6131a0a	lavf/segment: add segment_start_number option Consistent with the image2 muxer.	2012-12-13 21:38:43 +01:00
Stefano Sabatini	d93d03a492	lavf/segment: add function set_segment_filename() Factorize.	2012-12-13 21:05:07 +01:00
Michael Niedermayer	7726916c14	mpegts: check av_new_stream() return value. Fixes CID703728 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-13 17:46:17 +01:00
Nicolas George	2dbc84b1a8	lavf/matroskaenc: check for overflow in display width.	2012-12-13 12:45:07 +01:00
Michael Niedermayer	7897919a88	Merge remote-tracking branch 'qatar/master' * qatar/master: aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN. x86inc: fix stack alignment on win64 rtpproto: Remove unused defines Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-13 12:23:48 +01:00
Michael Niedermayer	2e5e2bf935	Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667' * commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667': rtpdec_mpeg4: Cosmetic cleanup rtpdec: Cosmetic cleanup of the header rtpdec: Get rid of a useless _s suffix on a struct name Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-13 12:18:12 +01:00
Michael Niedermayer	de7c95d551	Merge commit '7941159df6aad2d219e2a7184489be7a735dd944' * commit '7941159df6aad2d219e2a7184489be7a735dd944': rtpdec/enc: Remove outdated/useless/misleading comments rtpdec: Improve some comments rtpdec: Remove unused context variables rtpdec: Limit writing to the buffer size svq1: Fix building with -DDEBUG svq1: return meaningful error codes. Conflicts: libavcodec/svq1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-13 12:06:19 +01:00
Nicolas George	26db6535fc	lavf/matroskaenc: use integers to for display size. Avoid rounding differences between x86_32 and x86_64. Fix trac ticket #1997.	2012-12-12 20:59:34 +01:00
Michael Niedermayer	028cc42a16	read_gab2_sub: fix null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-12 17:46:05 +01:00
Martin Storsjö	29d2595ad7	rtpproto: Remove unused defines Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-12 16:01:24 +02:00
Nicolas George	16c3cb9bbf	lavf/concatdec: avoid leaking URLs. Use av_realloc instead of av_realloc_f to keep the original array in case of failure: it is freed in full by the fail label.	2012-12-12 12:15:57 +01:00
Michael Niedermayer	75b3911e5a	mxf_set_audio_pts: fix division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-12 11:35:47 +01:00
Michael Niedermayer	a0f659b275	oggspeexparse: fix array overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-12 11:21:23 +01:00
Martin Storsjö	f3f60dcbdd	rtpdec_mpeg4: Cosmetic cleanup Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-12 12:18:50 +02:00
Martin Storsjö	584a017925	rtpdec: Cosmetic cleanup of the header Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-12 12:18:44 +02:00
Martin Storsjö	abf74a1169	rtpdec: Get rid of a useless _s suffix on a struct name Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-12 12:18:38 +02:00
Martin Storsjö	7941159df6	rtpdec/enc: Remove outdated/useless/misleading comments Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-12 12:18:33 +02:00
Martin Storsjö	d6ec745246	rtpdec: Improve some comments The previous comment about the buffer was wildly inaccurate and misleading. Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-12 12:18:28 +02:00
Martin Storsjö	e66d448c75	rtpdec: Remove unused context variables These stem from back when both the rtp muxer and rtp depacketizing shared the same struct. Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-12 12:18:22 +02:00
Martin Storsjö	81ef519252	rtpdec: Limit writing to the buffer size This fixes potential buffer overwrites. Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-12 12:18:16 +02:00
Michael Niedermayer	8dbc384f15	Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3' * commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3': swfdec: cosmetics: fix indentation Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-12 10:16:23 +01:00
Michael Niedermayer	d276f28b7d	swfdec: print warning when len is cliped Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-12 10:14:06 +01:00
Michael Niedermayer	be5389d585	Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a' * commit 'e70c5b034c4787377e82cab2d5565486baec0c2a': swfdec: do better validation of tag length Make LOCAL_ALIGNED syntactically similar on all systems Conflicts: libavformat/swfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-12 09:55:56 +01:00
Michael Niedermayer	a202541f9b	cafdec: Check duration before use. Fix division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-12 01:22:09 +01:00
Michael Niedermayer	99a8552dae	bfi: fix division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-12 01:22:09 +01:00
Michael Niedermayer	7d05bbb656	mxfdec: drop unneeded extradata padding Found-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-11 16:40:28 +01:00
Justin Ruggles	d04c17c913	swfdec: cosmetics: fix indentation	2012-12-11 09:37:17 -05:00
Justin Ruggles	e70c5b034c	swfdec: do better validation of tag length Avoids trying to read a packet with 0 or negative size. Avoids a potential infinite loop due to seeking backwards. Partially based on a patch by Michael Niedermayer.	2012-12-11 09:36:26 -05:00
Michael Niedermayer	b65570808c	mxfdec: fix leak of extradata Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-11 14:43:47 +01:00
Peter Ross	53ae32d331	iff demuxer: support RGB8 and RGBN	2012-12-11 20:17:30 +11:00
Michael Niedermayer	67c1b5b026	lavf: remove unneeded pb check Fixes CID747727 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-11 09:34:47 +01:00
Michael Niedermayer	b688a28470	astenc: fix assignment vs compare Fixes CID747736 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-11 08:56:42 +01:00
Michael Niedermayer	a70b38d2dd	lavf: fix memleak Fixes CID747738 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-11 08:51:34 +01:00
Stefano Sabatini	8e9056559e	lavf/segment: add reset_timestamps option The new options reset the timestamps at each new segment, so that the generated segments will have timestamps starting close to 0. It is meant to address trac ticket #1425.	2012-12-11 00:18:23 +01:00
Michael Niedermayer	0a60f83075	http: dont null check p, its unneeded Fixes CID747740 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-11 00:03:23 +01:00
Michael Niedermayer	c73685398d	swfdec: check lens validity Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-10 17:25:44 +01:00
Michael Niedermayer	6321e02896	Merge remote-tracking branch 'qatar/master' * qatar/master: rtpdec: Remove an outdated todo comment rtpdec: Rename a static variable to normal naming conventions sh4: dsputil: remove duplicate of ff_gmc_c() Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-10 12:13:42 +01:00
Peter Ross	f540851ce3	mov: parse @PRM and @PRQ metadata tags These tags describe the product and quicktime library version respectively. Originate from Adobe Premier, but some other products use them.	2012-12-10 21:12:59 +11:00
Martin Storsjö	ccb59c106a	rtpdec: Remove an outdated todo comment This comment was added in `e309128f`, in 2002, and has been brought along since then more or less unmodified. The first point of the todo was implemented in `dbf30963` in 2006, the second one is not relevant to rtpdec.c (brought along from rtp.c in `8eb793c4` in 2008) but would be more relevant to the rtp muxer, although it isn't a good idea anyway. Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-10 11:58:32 +02:00
Martin Storsjö	0d85663a47	rtpdec: Rename a static variable to normal naming conventions Signed-off-by: Martin Storsjö <martin@martin.st>	2012-12-10 11:58:25 +02:00
Michael Niedermayer	78ac7ee970	Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264' * commit '5d471b73d20616f5ac701ff62e5de49465cda264': rtpdec: K&R formatting and spelling cosmetics cosmetics: Fix dropable --> droppable typo Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-10 01:27:10 +01:00
Michael Niedermayer	20899c54f0	http/utils: rename "demuxer" to mime_type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-10 01:00:16 +01:00
Paul B Mahol	cef28b5602	tak: reduce difference with qatar Mostly cosmetics changes, but also makes decoding little faster here. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-09 22:01:00 +00:00
Stefano Sabatini	ad47ac20ae	lavf/segment: remove silly assert(), improve feedback The code should not assert in case of invalid user input. Fails gracefully instead.	2012-12-09 20:42:35 +01:00
Michael Niedermayer	68bc012190	http/utils: move mime -> demuxer maping from http to utils Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-09 20:24:49 +01:00
Michael Niedermayer	e3d95b54db	probe: belive protocol content type if set and avoid lengthly probing. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-09 19:12:34 +01:00
Michael Niedermayer	76d851b656	http: export ICY content type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-09 19:12:34 +01:00
Nicolas George	160013736e	lavf: TED Talks JSON captions demuxer.	2012-12-09 18:50:38 +01:00
Peter Ross	9282fbb9ad	mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-09 17:15:46 +01:00
Michael Niedermayer	1374b5e15b	Merge remote-tracking branch 'qatar/master' * qatar/master: avio: K&R cosmetic formatting Conflicts: libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-09 14:08:01 +01:00
Martin Storsjö	5d471b73d2	rtpdec: K&R formatting and spelling cosmetics Signed-off-by: Diego Biurrun <diego@biurrun.de>	2012-12-09 13:36:11 +01:00
Michael Niedermayer	5de1f7a7bd	Merge commit '18e6f087c4a50bede8449ee164778945480be50c' * commit '18e6f087c4a50bede8449ee164778945480be50c': img2: document the options available hls: improve options description hls: use a meaningful long name hls: add start_number option h264: check for invalid zeros_left before writing Conflicts: doc/demuxers.texi doc/muxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-09 13:35:49 +01:00
Michael Niedermayer	9f92e590ba	mxfdec: fix double free Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-09 11:46:26 +01:00
Luca Barbato	1dd1c1c884	avio: K&R cosmetic formatting	2012-12-09 09:45:45 +01:00
Paul B Mahol	92f630eaf2	add forgotten AV_ prefix to some CODEC_IDs Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-09 01:47:58 +00:00
Mans Rullgard	91ac403b13	lavf: fix arithmetic overflows in avformat_seek_file() The values compared here can be more than INT64_MAX apart. Since the difference is always positive, converting to uint64_t before subtracting gives the correct result without overflows. Signed-off-by: Mans Rullgard <mans@mansr.com>	2012-12-08 19:35:16 +00:00
Luca Barbato	adbe03077d	hls: use a meaningful long name	2012-12-08 17:04:22 +01:00
Luca Barbato	5fbceb2c63	hls: add start_number option	2012-12-08 17:04:22 +01:00
Michael Niedermayer	57cee85023	Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f' * commit '096abfa15052977eed93f0b5e01afd2d47c53c1f': parser: fix large overreads bitstream: add get_bits64() to support reading more than 32 bits at once arm: detect cpu features at runtime on Linux Conflicts: libavcodec/parser.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-08 14:58:56 +01:00
Michael Niedermayer	7efee140d7	get_bits: rename get_bits_longlong to get_bits64 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-08 14:53:01 +01:00
Michael Niedermayer	b2b12a1022	mpegts: rename get_bits64 to get_ts64 Renaming because of name conflict Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-08 14:52:50 +01:00
Reimar Döffinger	8ee14aa5c7	lavf: improve avoid_negative_ts help text Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-08 13:30:43 +01:00
Paul B Mahol	57231e4d5b	tak: demuxer, parser, and decoder Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>	2012-12-07 16:15:02 -05:00
Michael Niedermayer	41540b36a1	bitstream: add get_bits64() to support reading more than 32 bits at once Also remove a duplicate function in the MPEG-TS demuxer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>	2012-12-07 16:15:02 -05:00
Clément Bœsch	710c4baf52	lavf: VobSub demuxer.	2012-12-07 21:18:06 +01:00
Paul B Mahol	fe63d41302	brstm: do not return partial packets Such packets are useless. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-07 17:55:45 +00:00
Michael Niedermayer	7c425e4f2d	Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333' * commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333': h264: check sps.log2_max_frame_num for validity mov: validate number of DataReferenceBox entries against box size mov: compute avg_frame_rate only if duration is known flac: change minimum and default of lpc_passes option to 1 Conflicts: libavcodec/h264_ps.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-07 15:52:43 +01:00
Paul B Mahol	8ca8b43d71	lavf/pcm: check size, do not produce invalid packets Inspired by `92b8c9d89e`. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-07 13:05:43 +00:00
Janne Grunau	8cc2fa1e5d	mov: validate number of DataReferenceBox entries against box size Avoids a 2G memory allocation and parsing of random data in mov_read_dref(). The fuzzed sample sample.mp4_s224424 triggers this.	2012-12-07 11:43:28 +01:00
Janne Grunau	80b6b31417	mov: compute avg_frame_rate only if duration is known Fixes an assert in fuzzed sample sample.mp4_s265930.	2012-12-07 11:43:28 +01:00
Michael Niedermayer	892750b07b	fix tipo Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-06 22:59:21 +01:00
Michael Niedermayer	656500c503	lavf: improve help text for avoid_negative_ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-06 22:06:40 +01:00
Paul B Mahol	547b8aeed4	smacker: use meaningful error codes Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-06 18:06:52 +00:00
Paul B Mahol	29c3ebf56e	siff: return meaningful error codes Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-06 18:00:37 +00:00
Paul B Mahol	7510a9a466	lavf/apedec: return meaningful error codes Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-06 17:17:49 +00:00
Nicolas George	32aedebdc5	lavf: add a concat demuxer.	2012-12-06 14:09:14 +01:00
Paul B Mahol	3bb3cddd96	mmfdec: fix seeking Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-06 11:56:00 +00:00
Paul B Mahol	9ef29af2e8	cafenc: do not include riff.h ff_codec_get_tag() was moved to internal.h Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 20:44:28 +00:00
Paul B Mahol	0aabd35b62	lavf/dxa: return meaningful error codes Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 20:18:04 +00:00
Paul B Mahol	c5008135c2	dxa: signal EOF Fixes #1948. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 20:03:30 +00:00
Paul B Mahol	4727611d48	ircamenc: 10l do not use avio_skip() Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 13:46:35 +00:00
Paul B Mahol	4c18562d02	Ensoniq Paris Audio File demuxer Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 13:01:22 +00:00
Paul B Mahol	880191637f	IRCAM demuxer & muxer Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 13:01:22 +00:00
Paul B Mahol	8ecf22ffb0	rsodec: use ff_pcm_read_packet() Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 12:40:57 +00:00
Paul B Mahol	acac16b5c7	soxdec: use ff_pcm_read_packet() Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 12:40:57 +00:00
Paul B Mahol	c090b5427d	audec: use ff_pcm_read_packet() Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 12:40:57 +00:00
Paul B Mahol	a647eb5a87	pvfdec: use ff_pcm_read_packet() Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 12:40:57 +00:00
Paul B Mahol	15ab0393fd	avr: use ff_pcm_read_packet() Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 12:40:57 +00:00
Paul B Mahol	93dc8ed0a1	pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers While here remove pts/dts code, it is apparently not needed and cause problems for demuxers that will use such function. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-05 12:40:57 +00:00
Michael Niedermayer	99efd59626	Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' * commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-05 13:34:45 +01:00
Michael Niedermayer	9db3fb6ed8	oggdec: prevent codec from changing through ogg_replace_stream() This prevents inconsistencies leading to out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-05 04:40:19 +01:00
Carl Eugen Hoyos	4e6f9db493	Set some audio stream properties in the vivo demuxer. This allows playback with MPlayer and the binary decoder. Reviewed-by: Paul B Mahol	2012-12-05 01:21:12 +01:00
Janne Grunau	54c7fe6d68	raw demuxer: initialize end of partial packets	2012-12-05 00:02:43 +01:00
Anton Khirnov	cb45553f57	Remove pointless #undefs of previously forbidden functions.	2012-12-04 21:40:22 +01:00
Nicolas George	03847eb825	lavf: compute probe buffer size more reliably. The previous code computes the offset by reversing the growth of the allocated buffer size: it is complex and did lead to inconsistencies when the size limit is reached. Fix trac ticket #1991.	2012-12-04 19:49:51 +01:00
Michael Niedermayer	83ddedbbf2	lavf: the core rfps code needs 2 durations to estimate rfps This fixes a regression where this count became 1 with HPM-GC\ EXPORT\ FCP-1A-AVCI100-1080i25-001.mxf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-04 18:04:29 +01:00
Paul B Mahol	a3bb59b163	av_register_protocol is gone :( Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-04 17:01:27 +00:00
Paul B Mahol	481c843a47	rawvideodec: set bit rate Fixes #1989. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-04 15:52:58 +00:00
Paul B Mahol	18aaed6475	gifdec: do not handle timestamps It is broken, and results will be messed up when seeking. This also fix duration displayed for streams when using -c copy. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-04 15:21:24 +00:00
Carl Eugen Hoyos	0877f64fea	Add debug output when skipping unknown swf tags. Reviewed-by: Clément Bœsch	2012-12-04 15:52:37 +01:00
Michael Niedermayer	dacd6202ec	Merge remote-tracking branch 'qatar/master' * qatar/master: ppc: always use pic for shared libraries build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place fate: ea, h264: prettyprinting and ordering cosmetics Conflicts: tests/fate/ea.mak tests/fate/h264.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-04 14:23:22 +01:00
Paul B Mahol	765debf51f	auenc: remove pointless assigment Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-04 12:42:50 +00:00
Paul B Mahol	266e88a47c	mmf: return meaningful error codes Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-04 11:59:46 +00:00
James Almer	b70251c0ad	AST Muxer Signed-off-by: James Almer <jamrial@gmail.com>	2012-12-04 11:25:46 +00:00
James Almer	7f0e7fc9e2	ast: Rename ast.c -> astdec.c Signed-off-by: James Almer <jamrial@gmail.com>	2012-12-04 10:51:38 +00:00
Peter Ross	1696c72af4	iff demuxer: include DEEP TVDC lookup table in extradata buffer Signed-off-by: Peter Ross <pross@xvid.org>	2012-12-04 20:53:26 +11:00
Michael Niedermayer	5e1bacf2d4	matroskadec: reset size when freeing data. Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-04 03:50:09 +01:00
Diego Biurrun	62641dce71	build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place	2012-12-03 19:32:03 +01:00
Michael Niedermayer	03290ffb57	mpegts: check that codec is not open in mpegts_find_stream_type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-03 17:34:38 +01:00
Michael Niedermayer	8897b5aa4c	mpegts_set_stream_info: remove unneeded codec id check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-03 17:29:56 +01:00
Michael Niedermayer	4c160b68cc	ff_mp4_read_dec_config_descr: check that the codec is not open Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-03 17:27:52 +01:00
Michael Niedermayer	b452c8a722	Merge remote-tracking branch 'qatar/master' * qatar/master: fate: fft: Fix libavcodec dependency build: Make the ISMV muxer select the MOV muxer configure: move arm arch extensions to a separate variable Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-03 02:59:19 +01:00
Diego Biurrun	31f16dc1a1	build: Make the ISMV muxer select the MOV muxer They share the same code, so building one w/o the other makes no sense.	2012-12-03 01:20:10 +01:00
Michael Niedermayer	ec79b1fc88	wtvdec: fix null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-02 22:36:15 +01:00
Michael Niedermayer	80aa89bdff	asfdec: check extradata size before alloc and read Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-02 20:44:58 +01:00
Michael Niedermayer	b61ba262a1	mpc8: check seektable size before attempting to use it. Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-02 04:21:42 +01:00
Carl Eugen Hoyos	196920060b	Add FourCC V264 for H264 in CCTV recordings.	2012-12-02 00:43:39 +01:00
Clément Bœsch	6d2892c9f5	lavf/assdec: return appropriate error code instead of -1.	2012-12-02 00:06:03 +01:00
Clément Bœsch	069c897549	lavf/assdec: add ass_ prefix to callbacks.	2012-12-02 00:06:03 +01:00
Clément Bœsch	e0260e25b0	lavf/assdec: rewrite using the demux subtitles API.	2012-12-02 00:06:03 +01:00
Clément Bœsch	bad4e112a2	lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.	2012-12-02 00:06:03 +01:00
Clément Bœsch	ad5d72b123	lavf/subtitles: seek a little more backward when necessary. If some previous subtitles are overlapping with the current time we make sure they are raised so the renderer can display them too.	2012-12-02 00:06:03 +01:00
Clément Bœsch	ff3624b1ad	lavf/subtitles: add ff_subtitles_queue_seek(). This function is almost identical to lavf/assdec:read_seek2(). It performs a generic seek for text subtitles demuxers for the new seeking API. The only difference with assdec:read_seek2 is the ts_diff being unsigned to avoid overflows. The seek callback in the ASS demuxer will be removed when it is redesigned to use FFDemuxSubtitlesQueue.	2012-12-02 00:06:03 +01:00
Paul B Mahol	56e149fda9	PVF demuxer Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-01 21:02:45 +00:00
Carl Eugen Hoyos	5442083b1c	Support Sorenson Spark in f4v files streamed by Flash Media Server.	2012-12-01 21:16:11 +01:00
Michael Niedermayer	873049e6d8	mxfdec: check index_tables before dereferencing in close. Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-01 20:19:09 +01:00
Paul B Mahol	9d5cfce855	gifdec: rudimentary seeking With this ffplay -loop X successfully seeks to start. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-01 11:43:50 +00:00
Paul B Mahol	b912895d94	mvi: check av_mallocz() result Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-12-01 09:06:24 +00:00
Michael Niedermayer	b90e795f73	check std tag size before reading. Fixes out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-01 00:30:11 +01:00
Paul B Mahol	57b00d7ab1	gifdec: remove width and height from demuxer context Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-30 16:09:02 +00:00
Paul B Mahol	d56b15017a	undo file modifiers that suck in Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-30 15:00:35 +00:00
Vitaliy E Sugrobov	f83657fcf6	Add exception for "gif" in image2 probe() method. Without this exception files with ".gif" extension by default recognized as input suitable for image2 demuxer rather than gif. In order to pass image through gif demuxer it was necessary to use -f gif option. This change affected 'make fate' test results because previously image2 demuxer and gif decoder took only first frame of multiframe test data, which is no longer true with gif demuxer. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>	2012-11-30 14:35:11 +00:00
Vitaliy E Sugrobov	5603b2bf6e	Gif demuxer Gif demuxer is capable of extracting multiple frames from gif file. In conjunction with gif decoder it implements support for reading animated gifs. Demuxer has two options available to user: default_delay and min_delay. These options are for protection from too rapid gif animations. In practice it is standard approach to slow down rendering of this kind of gifs. If you try to play gif with delay between frames of one hundredth of second (100fps) using one of major web browsers, you get significantly slower playback, around 10 fps. This is because browser detects that delay value is less than some threshold (usually 2 hundredths of second) and reset it to default value (usually 10 hundredths of second, which corresponds to 10fps). Manipulating these options user can achieve the same effect during conversion to some video format. Otherwise user can set them to not protect from rapid animations at all. The other case when these options necessary is for gif images encoded according to gif87a standard since prior to gif89a there was no delay information included in file. Bump lavf minor version. Signed-off-by: Vitaliy E Sugrobov <vsugrob@hotmail.com>	2012-11-30 14:33:58 +00:00
Michael Niedermayer	db29a7c7c2	Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320' * commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320': build: The FLAC encoder also depends on the flacdsp code img2: K&R formatting cosmetics h264: check context state before decoding slice data partitions flashsv: make sure data for zlib priming is available Conflicts: libavcodec/Makefile libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-30 14:49:13 +01:00
Paul B Mahol	1560c3295d	iff: fix some incorrect interpretations of invalid files Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-30 10:44:00 +00:00
Paul B Mahol	50b5c2296a	iff: MAUD support Based on patch by Piotr Bandurski Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-30 10:34:55 +00:00
Carl Eugen Hoyos	ccf771cd79	Correctly skip strf tag for subtitles when decoding avi. Fixes ticket #1797.	2012-11-30 10:18:37 +01:00
Michael Niedermayer	10416a4d56	id3v2: check index against buffer size. Fix out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-29 23:12:42 +01:00
Paul B Mahol	9a31997938	BRSTM demuxer Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-29 19:04:35 +00:00
Diego Biurrun	cc7d5cfeec	img2: K&R formatting cosmetics Also introduce local img_ namespace to simplify debugging.	2012-11-29 17:15:57 +01:00
Michael Niedermayer	9f8e2e92ae	Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd' * commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd': fate: h264: Add dependencies fate: ea: Add dependencies fate: Do not unconditionally run libavutil tests rtpenc_chain: Remove unused variable nuv: check for malloc failure when allocating extradata nuv: use the stream indices generated by avformat_new_stream() Conflicts: tests/fate/ea.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-29 14:16:46 +01:00
Michael Niedermayer	52066bdb30	Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b' * commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b': nuv: cosmetics: pretty-printing Conflicts: libavformat/nuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-29 14:07:51 +01:00
Michael Niedermayer	d7b20bfbb5	Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66' * commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66': lavf: move nuv fourcc audio tags from riff to nuv lavf: add a common function for selecting a pcm codec from parameters Conflicts: libavformat/internal.h libavformat/mov.c libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-29 14:00:44 +01:00
Michael Niedermayer	076300bf8b	Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' * commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-29 13:45:57 +01:00
Daniel Verkamp	a0958949eb	Vivo demuxer	2012-11-28 20:13:05 +00:00
Diego Biurrun	2c4593dd13	rtpenc_chain: Remove unused variable	2012-11-28 18:17:49 +01:00
Justin Ruggles	c74f81786d	nuv: cosmetics: pretty-printing	2012-11-28 11:18:50 -05:00
Justin Ruggles	5c7bf2ddde	lavf: move nuv fourcc audio tags from riff to nuv	2012-11-28 11:18:50 -05:00
Justin Ruggles	ab87d9b667	nuv: check for malloc failure when allocating extradata Also make sure extradata is freed in the case where multiple NUV_EXTRADATA frame types are found. This may not happen in practice, but it could happen in a malformed stream, which would lead to a memleak if not handled.	2012-11-28 11:18:50 -05:00
Justin Ruggles	261e9348ef	lavf: add a common function for selecting a pcm codec from parameters	2012-11-28 11:18:50 -05:00
Justin Ruggles	838ed296df	nuv: use the stream indices generated by avformat_new_stream()	2012-11-28 11:18:50 -05:00
Justin Ruggles	bfe5454cd2	lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h	2012-11-28 11:18:49 -05:00
Justin Ruggles	cdaa1f84fb	lavf: move "MP3 " fourcc from riff to nut Original commit, `7b24f9b`, says it was added because it is used in libnut.	2012-11-28 11:18:49 -05:00
Paul B Mahol	01eed8c607	iff demuxer: 16SV support Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-28 15:55:14 +00:00
Paul B Mahol	23101ceaa2	avrdec: implement seeking Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-28 13:03:48 +00:00
Paul B Mahol	b0d9b011c7	avrdec: sample rate takes 3 bytes not 4 Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-28 11:02:22 +00:00
Paul B Mahol	1793128cf7	avrdec: fix typo in .long_name Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-28 10:56:59 +00:00
Michael Niedermayer	2754dbb6e1	nut: put nut PCM audio tags in front of avi tags. This fixes correctly storing and identifying PCM in nut. Based on patch by Luca Barbato Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-28 02:03:56 +01:00
Michael Niedermayer	577b39aea2	Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8' * commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8': h264: check ref_count validity for num_ref_idx_active_override_flag h264: add missing new line to log message dcadec: skip QMF on unused channels wavenc: write fact chunk sample count at the correct file position riff: do not add empty metadata tags in INFO chunk Conflicts: libavcodec/dcadec.c libavcodec/h264.c libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-27 14:31:04 +01:00
Michael Niedermayer	b4d4e51027	Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9' * commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9': riff: only warn on a bad INFO chunk code size instead of failing configure: Add separate list for libraries and use where appropriate x86: float_dsp: add SSE version of vector_fmul_scalar() Conflicts: configure libavformat/riff.c libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-27 14:10:05 +01:00
Michael Niedermayer	257196209f	file: fix 10l error in access() check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-27 13:24:00 +01:00
Paul B Mahol	51d6879939	AFC demuxer Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-27 10:17:28 +00:00
Paul B Mahol	10c8f91341	astdec: improve probing Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-27 10:16:30 +00:00
Michael Niedermayer	8aa6d899c0	cafdec: fix seeking with adpcm Fixes Ticket1906 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-27 05:03:24 +01:00
Michael Niedermayer	16ef48c37f	file: Fallback to stat() based file_check() when access() or its named flags are unavailable. Should fix compilation on native windows We could also use _access() and literal numbers as flags but i cant test it and the compilation failure should be fixed ASAP Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-27 05:03:24 +01:00
Michael Niedermayer	407921072f	file: fix file_check() Fixes Ticket1904 This should work on windows, but if not please contact me ASAP i have another idea on how to solve this without access() if that really doesnt work on windows. Strongly based on patch by divVerent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-27 03:53:53 +01:00
Michael Niedermayer	2fe0094e0b	wavenc: write fact chunk sample count at the correct file position Fixes curruption of metadata in the INFO chunk. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>	2012-11-26 19:11:10 -05:00
Justin Ruggles	3c370f5abc	riff: only warn on a bad INFO chunk code size instead of failing fixes Bug 392	2012-11-26 19:08:51 -05:00
Justin Ruggles	259d8c5647	riff: do not add empty metadata tags in INFO chunk	2012-11-26 19:08:51 -05:00
Michael Niedermayer	386fc67c79	Merge remote-tracking branch 'qatar/master' * qatar/master: lavf: avoid integer overflow in ff_compute_frame_duration() Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-26 16:24:23 +01:00
Peter Ross	76f60788e7	iff demuxer: don't bother checking bitmap compression type; iff decoder does this now Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com>	2012-11-26 23:29:02 +11:00
Janne Grunau	7709ce029a	lavf: avoid integer overflow in ff_compute_frame_duration() Scaling the denominator instead of the numerator if it is too large loses precision. Fixes an assert caused by a negative frame duration in the fuzzed sample nasa-8s2.ts_s202310. CC: libav-stable@libav.org	2012-11-26 10:26:08 +01:00
Michael Niedermayer	bf2f93cdbf	Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc' * commit '28c8e288fa0342fdef532a7522a4707bebf831cc': x86: h264_chromamc: port to cpuflags yop: fix typo avconv: fix copying per-stream metadata. doc: avtools-common-opts: Fix terminology concerning metric prefixes configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge riff: Make ff_riff_tags static and move under appropriate #ifdef Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-26 00:43:45 +01:00
Paul B Mahol	b491da18d1	yop: fix typo Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>	2012-11-25 11:10:52 -05:00
Diego Biurrun	ddb009425c	riff: Make ff_riff_tags static and move under appropriate #ifdef The table is not used outside the file.	2012-11-25 13:32:10 +01:00
Michael Niedermayer	e6305f7631	mov: set flags to indicate that byte wise seeking is not supported. Fixes Ticket1831 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-25 01:19:33 +01:00
Nicolas George	ca4872e887	lavf/sbgdec: use proper constants for av_log().	2012-11-24 23:56:52 +01:00
Carl Eugen Hoyos	d080292651	Support u8 in aiff. Fixes ticket #1960. Reviewed-by; Paul B Mahol	2012-11-24 21:21:50 +01:00
Piotr Bandurski	081bf60ec6	c93: signal EOF	2012-11-24 15:04:32 +00:00
Paul B Mahol	05b02e9c0f	mmf: simplify code by using FFMIN Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-24 14:27:55 +00:00
Paul B Mahol	7f321fca23	mmf: signal EOF Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-24 14:24:13 +00:00
Paul B Mahol	9378a90add	omadec: remove stale comment Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-24 11:41:43 +00:00
Paul B Mahol	3d8e684f05	ADPCM IMA Dialogic decoder Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-24 10:56:47 +00:00
Paul B Mahol	1a61c7a54b	wvenc: multichannel muxing Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-24 10:20:46 +00:00
Paul B Mahol	1b9467aea1	omaenc: remove superfluous "OMA: " Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-24 10:04:20 +00:00
Paul B Mahol	bc5ba1c7fd	omaenc: abort for unsupported codecs Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-24 10:04:20 +00:00
Piotr Bandurski	6d6bf250dd	riff: fix decoding of 24-bit packed int (type 1, 20-bit)	2012-11-24 10:54:38 +01:00
Carl Eugen Hoyos	95903e3cfd	Support G.722 in Sun AU.	2012-11-24 10:43:32 +01:00
Carl Eugen Hoyos	df651cf42e	Add an annotation field as required by the specification when muxing Sun AU. Reviewed-by: Paul B Mahol	2012-11-24 10:43:11 +01:00
Michael Niedermayer	09456d0df1	riff: ignore ff_read_riff_info() failure. Some files simply contain invalid info tags. Fixes unrelated bug posted into Ticket1821 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-23 23:41:57 +01:00
Michael Niedermayer	0efcf16a3e	replace av_log(0, by av_log(NULL, The first parameter is a pointer and NULL is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-23 18:10:02 +01:00
Michael Niedermayer	e9c372362c	id3v2: restructure compressed and unsync code This should fix the interaction between the 2. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-23 03:28:20 +01:00
Michael Niedermayer	3616afced6	rmdec: fix av_log level and context Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-23 01:19:48 +01:00
Michael Niedermayer	be89693ddc	avidec: try to support oddly muxed MMES stream Fixes ticket1804 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-22 23:20:35 +01:00
Paul B Mahol	6aa6baa4f2	xmv: signal EOF Fixes #1946. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-22 20:37:24 +00:00
Michael Niedermayer	66b45d8f7a	movenc: fix assert failure caused by rounding. Fixes Ticket1820 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-22 20:58:06 +01:00
Paul B Mahol	32cd3a7c16	ADPCM AFC decoder Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-22 19:27:44 +00:00
Michael Niedermayer	08e26e7f5c	id3v2: print ver/flags/len on debug level. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-22 19:31:04 +01:00
Michael Niedermayer	a9cfbf6d4b	Merge remote-tracking branch 'qatar/master' * qatar/master: id3v2: fix reading unsynchronized frames. cdgraphics: fix incorrect vertical offset mask in cdg_scroll() apetag: fix error handling in ff_ape_parse_tag() Conflicts: libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-22 15:36:50 +01:00
Anton Khirnov	9ae80e6a9c	id3v2: fix reading unsynchronized frames. Current code would incorrectly process e.g. 'ff 00 ff 00 ff' to 'ff ff ff', while it should be 'ff ff 00 ff'. Fixes Bug 395. CC: libav-stable@libav.org	2012-11-22 13:40:04 +01:00
Aleksi Nurmi	492a5f835c	brender_pix: a new image decoder PIX is an image file format that was used by the BRender 3d engine. Signed-off-by: Aleksi Nurmi <aleksi.nurmi@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-22 01:06:25 +01:00
Peter Ross	bdba96e93c	use correct doxygen parameter direction syntax Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-21 23:56:15 +01:00
Peter Ross	9ccc349f77	ensure comment blocks that contain doxygen commands start with double asterix Reveiwed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-21 23:55:15 +01:00
Piotr Bandurski	88161b2a52	siff: signal EOF Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-21 23:52:20 +01:00
Piotr Bandurski	9530439e5f	segafilm: signal EOF Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-21 23:51:21 +01:00
Piotr Bandurski	1ed7ca00dc	bethsoftvid: signal EOF Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-21 23:22:38 +01:00
Piotr Bandurski	425d0888c3	bfi: signal EOF Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-21 23:22:38 +01:00
Paul B Mahol	8e6957964e	yop: fix 10l typo Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-21 20:15:02 +00:00
Peter Ross	0705cbd002	bink: return AVERROR_EOF upon reaching end of file Fixes ticket #1935. Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-21 19:25:20 +01:00
Paul B Mahol	e4e7846db8	cdxl: use url_feof() Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-21 16:39:44 +00: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
Xi Wang	b655cfefaf	apetag: fix error handling in ff_ape_parse_tag() The following error handling is broken due to signedness. int file_size; uint32_t tag_bytes; int64_t tag_start; ... tag_start = file_size - tag_bytes - APE_TAG_FOOTER_BYTES; if (tag_start < 0) { ... } Note that tag_bytes is unsigned, which makes the right-hand side of `tag_start = ...' unsigned, too. The 32-bit unsigned value is then zero-extended to 64 bits. Therefore, tag_start must be non-negative, and the check (tag_start < 0) is always false, which breaks the error handling. This patch fixes the check. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2012-11-21 14:35:26 +01:00
Piotr Bandurski	4bf3bc6f96	sierravmd: signal EOF	2012-11-21 10:38:52 +00:00
Paul B Mahol	e94f429474	cafdec: return right code if EOF is reached Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-21 10:34:38 +00:00
Piotr Bandurski	25d8ebd422	thp: signal EOF	2012-11-21 10:21:54 +00:00
Piotr Bandurski	9a0ecd507a	rpl: return AVERROR_EOF instead of -1	2012-11-21 09:48:46 +00:00
Clément Bœsch	030db0c1dd	lavf/hls: whitespace cosmetics after `23db5418`.	2012-11-21 08:01:51 +01:00
Clément Bœsch	57d7e21c34	lavf: move libmodplug registration with the other ext lib. Also remove the duplicated #if.	2012-11-21 08:00:35 +01:00
LYF	23db5418ed	hls: create an AVProgram for each variant Without the information, application may choose audio from one variant and video from another variant, which leads to fetch two variants from network. This enables av_find_best_stream() to find matching audio and video streams, so that only one variant is fetched from network. Signed-off-by: LYF <yefei.li@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-21 01:24:01 +01:00
Stefano Sabatini	8b6aeb1fcd	lavf/segment: fix value for the M3U8 EXT-X-MEDIA From the M3U8 specification: \|The EXT-X-MEDIA-SEQUENCE tag indicates the sequence number of the first \|URI that appears in a Playlist file. Previously it was using the list index number. Also remove now unused list_count field.	2012-11-20 22:48:28 +01:00
Stefano Sabatini	5a1ac463e0	lavf/segment: do not pre-increment segment_idx value Increment the value just when a new segment with the given index is started. Simplify logic, improve readability.	2012-11-20 22:48:28 +01:00
Stefano Sabatini	2b31aa8895	lavf/segment: unbreak behavior for segment muxer The segment muxer presumes the use of AVFMT_GLOBALHEADER, ssegment should be use in case of formats which requires no global headers. Regression introduced when merging `0826d8513d`.	2012-11-20 22:48:28 +01:00
Stefano Sabatini	b6c05879ea	lavf/segment: consistently use "seg" in segment_start()	2012-11-20 22:48:28 +01:00
Clément Bœsch	cc88734c3c	lavf/srtdec: trim line break event separators from packet. The muxer add them automatically, so this avoid having a bunch of line breaks all over the output files. One '\n' is still kept/added because the lavc subrip decoder seems to have trouble with line ending abruptly (it doesn't flush correctly the tags). This bug is harmless but should be fixed; though, this doesn't look like a trivial change. When this bug gets fixed, we can consider removing the '\n' at the end of the packet. The 2048B buffer limit was also removed while moving to AVBPrint API. Note that this doesn't really matter since the decoder is limited as well.	2012-11-20 22:38:39 +01:00
Carl Eugen Hoyos	d513fb1c75	Add -skip_initial_bytes option. Fixes ticket #1909.	2012-11-20 22:04:14 +01:00
Carl Eugen Hoyos	b1e190d0fd	Correctly signal EOF when demuxing caf files.	2012-11-20 22:04:03 +01:00
ChanMin Kim	4293464705	lavf/segment: do not copy codec_tag when not available Some muxers do not allow stream if codec_tag is incompatible. Sometimes the passed input codec's codec_tag is not compatible with the output muxer. Because the codec_tag field of the segment muxer cannot be set, ffmpeg.c doesn't know how to handle these cases. Signed-off-by: ChanMin Kim <kcm1700@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-20 19:19:31 +01:00
Michael Niedermayer	07a866282f	oggdec: fix memleak on header parsing failure Fixes Ticket1931 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-20 15:14:12 +01:00
Peter Ross	ed27ed9f4f	iff: DEEP RLE 32-bit decoder Fixes ticket #1046. Signed-off-by: Peter Ross <pross@xvid.org>	2012-11-20 09:49:49 +11:00
Gavin Kinsey	19660a8876	Allow use of @ character in username and passwords embedded in URLs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-19 18:02:28 +01:00
Paul B Mahol	305fe9ae59	nut: add tag for PCM signed 8-bit planar Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-19 09:55:20 +00:00
Carl Eugen Hoyos	a5d4e94a97	Support iLBC in caf.	2012-11-19 10:19:50 +01:00
Marton Balint	4bee03034b	lavf: let av_find_best_stream use bitrate info if available I guess the user expects to see the stream with the highest bitrate, not with the most frames, this is especially useful for multi bitrate streams. This patch changes av_find_best_stream to select the stream based on a number of conditions, the first condition has the highest priority, the last condition has the lowest: 1) Select the stream with the highest FFMIN(5, codec_info_nb_frames) value 2) Select the stream with the highest bitrate 3) Select the stream with the highest codec_info_nb_frames 4) Select the first stream Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-18 13:57:08 +01:00
Peter Ross	05001dd7ca	iff: process DEEP DLOC chunk to obtain image dimensions Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-18 13:47:17 +01:00
Peter Ross	d26eeb0dc1	iff: recognise more DEEP colorspaces Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-18 13:46:36 +01:00
Paul B Mahol	d0a503c97c	ast: check bit depth too Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-18 12:29:05 +00:00
Paul B Mahol	f5f29910dd	img2enc: remove dead code Nothing in lavc sets extradata for such codec and this is wrong place for it anyway. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-18 12:09:20 +00:00
Carl Eugen Hoyos	ab82b77822	Fix possible NULL-pointer dereference when decoding mov files. Fixes CID743440, introduced in `850e5c0`.	2012-11-18 08:52:50 +01: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
Michael Niedermayer	fb1ea777b3	electronicarts: check size before reading duration out of a chunk. Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-17 20:43:56 +01:00
Paul B Mahol	461ecea068	AST demuxer Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-17 19:30:08 +00:00
Paul B Mahol	9ba41ae63e	PCM signed 16-bit big-endian planar decoder Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-17 19:30:08 +00:00
Paul B Mahol	37e2a9783f	lxfdec: remove deplanarization hack Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-17 19:30:04 +00:00
Paul B Mahol	467dfd5dfa	PCM signed 24-bit/32-bit little-endian planar decoder Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-17 19:09:43 +00:00
Michael Niedermayer	f96a653184	flvdec: disable hack that attempts to parse aac bitstream in the flv demuxer. I was unable to find a file that needs this hack, if you have one please contact us! Fixes out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-17 18:49:08 +01:00
Stefano Sabatini	a0f2d3fff5	lavf/avienc: return proper error codes, and provide some more feedback	2012-11-17 11:15:00 +01:00
Michael Niedermayer	caedd51e56	mxfdec: fix potential integer overflow in mxf_compute_sample_count() Fixes CID743442 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-17 02:20:50 +01:00
Matthieu Bouron	83cab07a4c	mxfdec: set audio packets pts Also fix playback of ntsc files. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-16 14:12:37 +01:00
Xidorn Quan	8ee6db393c	mov: add more udta meta data recognition Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-16 14:12:37 +01:00
Clément Bœsch	2dd0da787c	lavf/mp3enc: make sure the header is valid before writing audio pkt. An invalid header can lead avpriv_mpegaudio_decode_header() to overread and/or div by zero.	2012-11-16 14:11:08 +01:00
Janne Grunau	c84cce5a99	mxfdec: fix typo in mxf_read_seek() Check the number of index tables before using byte offset based seeking instead of the index_tables pointer. Found by Måns Rullgård <mans@mansr.com>.	2012-11-15 17:37:09 +01:00
Carl Eugen Hoyos	850e5c041d	Read QuickTime version 1 audio fields in broken mov files. Matrox XMIO capture boards write files with major brand "JUNK" and compatible brand "qt " that contain QuickTime version 1 audio fields. Fixes ticket #1881.	2012-11-15 14:38:19 +01:00
Michael Niedermayer	a9b1536a01	Merge remote-tracking branch 'qatar/master' * qatar/master: bgmc: Fix av_malloc checks in ff_bgmc_init() rtp: set the payload type as stream id Conflicts: libavformat/rtpenc_chain.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-15 11:31:13 +01:00
Michael Niedermayer	4d941eac16	Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040' * commit '3b4296f41473a5b39e84d7a49d480624c9c60040': avformat: clarify stream id for muxing fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests ppc: do not pass redundant compiler flags avutil: change GET_UTF8 to not use av_log2() segment: fix NULL pointer dereference in seg_write_header() Conflicts: tests/fate/aac.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-15 11:12:25 +01:00
Michael Niedermayer	a3cb7f992f	xwma: check bytes_per_sample, fix division by 0. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-15 00:56:54 +01:00
Luca Barbato	3b4296f414	avformat: clarify stream id for muxing	2012-11-14 20:38:51 +01:00
Luca Barbato	8034130e06	rtp: set the payload type as stream id Support multiple video/audio streams with different format in the same session. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2012-11-14 20:38:51 +01:00
Paul B Mahol	dbc44667ce	Add missing dependency for avr demuxer Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-14 18:02:28 +00:00
Michael Niedermayer	87d073eacc	mov: Dont try to calculate with unknown durations, fix division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-14 14:08:44 +01:00
Michael Niedermayer	e13d5e9a4b	Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' * commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2': x86: h264_weight_10bit: port to cpuflags libtheoraenc: add missing pixdesc.h header avcodec: remove ff_is_hwaccel_pix_fmt pixdesc: add av_pix_fmt_get_chroma_sub_sample hlsenc: stand alone hls segmenter Conflicts: doc/muxers.texi libavcodec/ffv1enc.c libavcodec/imgconvert.c libavcodec/mpegvideo_enc.c libavcodec/tiffenc.c libavformat/Makefile libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-14 11:59:20 +01:00
Xi Wang	e8769b37fe	segment: fix NULL pointer dereference in seg_write_header() Since the pointer `oc' is NULL, oc->oformat->name will cause a null pointer dereference. This patch changes it to seg->oformat->name. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>	2012-11-14 12:33:27 +02:00
Michael Niedermayer	1f1960519a	lxfdec: fix "no audio stream" check. avoid null ptrs deref Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-14 00:03:42 +01:00
Michael Niedermayer	af9ec3dd1d	av_probe_input_format3: support NULL as buffer. Fixes null ptr deref Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-13 22:21:10 +01:00
Michael Niedermayer	eab022d863	mpegts: prevent freeing ones own section in pat_cb Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-13 21:45:53 +01:00
Michael Niedermayer	4392e69ad4	mov: check stps correctly, avoid overreading 1 element. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-13 21:45:53 +01:00
Michael Niedermayer	3669915e93	dvdec: check ipcm more completely, avoid assert failure. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-13 21:45:53 +01:00
Clément Bœsch	41ebbb3b04	lavf/wtvenc: fix s[tp]_pairs memleak.	2012-11-13 20:02:43 +01:00
Michael Niedermayer	4facddd568	mpegts: dont set stream info when a decoder has already been opened. Fixes assertion failure. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-13 15:44:13 +01:00
Michael Niedermayer	327cd0d09b	mpegts: prevent freeing ones own section in pmt_cb Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-13 15:44:13 +01:00
Paul B Mahol	09a0392341	paf: set channel layout Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-13 13:25:19 +00:00
Michael Niedermayer	799d749c77	Merge remote-tracking branch 'qatar/master' * qatar/master: (24 commits) yop: set channel layout wtv: set channel layout for mpeg audio westwood_aud: set channel layout wc3movie: set channel layout tmv: set channel layout tiertexseq: set channel layout swfdec: set channel layout sol: set channel layout smacker: set channel layout siff: set channel layout sierravmd: set channel layout rtpdec_amr: set channel layout rsodec: set channel layout rmdec: set channel layout for RA version 3 qcp: set channel layout psxstr: set channel layout omadec: set channel layout oggparsespeex: validate channel count and set channel layout nuv: set channel layout mxg: set channel layout ... Conflicts: libavformat/swfdec.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-13 11:09:38 +01:00
Michael Niedermayer	7eb40d85f2	Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b' * commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b': (21 commits) jvdec: set channel layout iss: set channel layout ipmovie: set channel layout iff: set channel layout idroqdec: set channel layout gxfdec: set channel layout when applicable gsmdec: set channel layout flvdec: set channel layout dv: set channel layout dsicin: set channel layout daud: set channel layout cdxl: set channel layout bmv: set channel layout bink: set channel layout bfi: set channel layout bethsoftvid: set channel layout apc: set channel layout amr: set channel_layout ppc: replace pointer casting with AV_COPY32 ppc: fix some unused variable warnings ... Conflicts: libavformat/amr.c libavformat/iff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-13 10:55:07 +01:00
Luca Barbato	22a0827dff	hlsenc: stand alone hls segmenter Simplifies usage but has higher latency.	2012-11-13 01:37:05 +01:00
Michael Niedermayer	abe68364a3	swfdec: check space before copy Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-12 19:29:27 +01:00
Paul B Mahol	87c113f4b3	wv: use right function to read block_samples Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-12 15:50:04 +00:00
Justin Ruggles	b9629acb6b	yop: set channel layout	2012-11-12 10:33:23 -05:00
Justin Ruggles	935fbb66ef	wtv: set channel layout for mpeg audio	2012-11-12 10:33:23 -05:00
Justin Ruggles	7b48d93e8a	westwood_aud: set channel layout	2012-11-12 10:33:22 -05:00
Justin Ruggles	2ce7f820d4	wc3movie: set channel layout	2012-11-12 10:33:22 -05:00
Justin Ruggles	a94b0267f2	tmv: set channel layout	2012-11-12 10:33:22 -05:00
Justin Ruggles	7f348bd764	tiertexseq: set channel layout	2012-11-12 10:33:22 -05:00
Justin Ruggles	a3949fe11f	swfdec: set channel layout	2012-11-12 10:33:22 -05:00
Justin Ruggles	1c7587728c	sol: set channel layout	2012-11-12 10:33:22 -05:00
Justin Ruggles	bfccd76adb	smacker: set channel layout	2012-11-12 10:33:22 -05:00
Justin Ruggles	57e590e4b8	siff: set channel layout	2012-11-12 10:33:22 -05:00
Justin Ruggles	a634896cf8	sierravmd: set channel layout	2012-11-12 10:33:21 -05:00
Justin Ruggles	c1ac602d53	rtpdec_amr: set channel layout	2012-11-12 10:33:21 -05:00
Justin Ruggles	ce842029ce	rsodec: set channel layout	2012-11-12 10:33:21 -05:00
Justin Ruggles	60a585304c	rmdec: set channel layout for RA version 3	2012-11-12 10:33:21 -05:00
Justin Ruggles	444b79c18a	qcp: set channel layout	2012-11-12 10:33:21 -05:00
Justin Ruggles	b5e3e77711	psxstr: set channel layout	2012-11-12 10:33:21 -05:00
Justin Ruggles	c9759eb426	omadec: set channel layout	2012-11-12 10:33:21 -05:00
Justin Ruggles	ef1b23ad21	jvdec: set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	d4088efbe2	oggparsespeex: validate channel count and set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	4371131283	iss: set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	232e9c4c4b	nuv: set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	cc57228e31	mxg: set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	66d7ceb4aa	mvi: set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	f6c6e5aac1	mpc7: set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	f24b0b1b6c	mmf: set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	87199d34db	mm: set channel layout	2012-11-12 10:33:20 -05:00
Justin Ruggles	41a2d9590d	ipmovie: set channel layout	2012-11-12 10:33:19 -05:00
Justin Ruggles	024e03701c	iff: set channel layout	2012-11-12 10:33:19 -05:00
Justin Ruggles	73e2007f3d	idroqdec: set channel layout	2012-11-12 10:33:19 -05:00
Justin Ruggles	f6c3adde41	gxfdec: set channel layout when applicable	2012-11-12 10:33:19 -05:00
Justin Ruggles	d4a105ae5c	gsmdec: set channel layout	2012-11-12 10:33:19 -05:00
Justin Ruggles	644d8d2e5a	flvdec: set channel layout	2012-11-12 10:33:19 -05:00
Justin Ruggles	d5ca70b103	dv: set channel layout	2012-11-12 10:33:19 -05:00
Justin Ruggles	49e7af06f2	dsicin: set channel layout	2012-11-12 10:33:19 -05:00
Justin Ruggles	a05a63785c	daud: set channel layout Update FATE reference due to WAVE channel mask now being set correctly.	2012-11-12 10:33:18 -05:00
Justin Ruggles	0d09a5848f	cdxl: set channel layout	2012-11-12 10:33:18 -05:00
Justin Ruggles	e8088d6e4b	bmv: set channel layout	2012-11-12 10:33:18 -05:00
Justin Ruggles	2fe804f316	bink: set channel layout	2012-11-12 10:33:18 -05:00
Justin Ruggles	ff50d27a63	bfi: set channel layout	2012-11-12 10:33:18 -05:00
Justin Ruggles	b5d1a15d1b	bethsoftvid: set channel layout	2012-11-12 10:33:18 -05:00
Justin Ruggles	39f0e9b8c6	apc: set channel layout	2012-11-12 10:33:18 -05:00
Justin Ruggles	5595368bcc	amr: set channel_layout	2012-11-12 10:33:18 -05:00
Michael Niedermayer	03b078721c	Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-12 11:32:11 +01:00
Clément Bœsch	3704804c8f	lavf/assenc: add non strict ts flag. ASS can have several events at the same time.	2012-11-11 22:58:56 +01:00
Michael Niedermayer	5aedee4fac	gxf: avoid null ptr deref without streams. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-11 20:58:04 +01:00
Justin Ruggles	a903f8f087	Include libavutil/channel_layout.h instead of libavutil/audioconvert.h Also reorder some other #include when applicable.	2012-11-11 13:35:12 -05:00
Michael Niedermayer	192db16b9c	segafilm: fix division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-11 18:32:46 +01:00
Michael Niedermayer	f1d6f013b2	omadec: fix len check in nprobe() prevent out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-11 18:16:48 +01:00
Peter Ross	6f78ba8b0b	electronic arts: support rare samples containing adpcm_ea_r1 audio Fixes ticket #1549. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-11 12:52:02 +01:00
Peter Ross	d168fcb68f	electronicarts: use av_log_ask_for_sample Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-11 12:51:16 +01:00
Michael Niedermayer	d7da4d47a6	mxfdec: avoid double free and leaks. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-11 02:20:04 +01:00
Michael Niedermayer	c2ca0163af	matroskadec: check h in generic rm packet shuffler Fixes crash Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-11 01:19:44 +01:00
Clément Bœsch	e56b098410	lavf/srtenc: ignore invalid timed packets instead of failing. This way we don't abort in the middle of remuxing, just warn about an event ignored. The index increment is moved to make sure the output numbers still make sense.	2012-11-10 22:43:27 +01:00
Michael Niedermayer	eb3dc23705	mov: Make sure no streams after the header lack a timescale. Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-10 13:29:23 +01:00
Piotr Bandurski	cc5c2ef09d	riff: add SMV2 FourCC for H264 sample: http://samples.mplayerhq.hu/V-codecs/smv2.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-10 13:16:14 +01:00
Carl Eugen Hoyos	b56ff0b261	Allow forcing a frame size in bytes for image2pipe. This allows decoding of concatenated frames encoded in uncompressed formats like v210. The frame size cannot be generally calculated, FFmpeg also supports broken encoders. Fixes ticket #1869.	2012-11-10 02:25:17 +01:00
Carl Eugen Hoyos	f91f049a22	Add yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder. Reviewed-by: Paul B Mahol	2012-11-10 02:19:55 +01:00
Piotr Bandurski	49c2f2d57e	riff: add GXVE FourCC for WMV2 sample: http://samples.mplayerhq.hu/V-codecs/ViVD/vivd.avi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-10 01:58:51 +01:00
Michael Niedermayer	c63e76ba35	ebml_read_binary: use fast_padded_malloc() Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-09 23:35:58 +01:00
Michael Niedermayer	e481ba2ed7	vqf: check samplerate, avoid division by 0. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-09 18:05:19 +01:00
Michael Niedermayer	7989f7e0b5	xmv: Fix integer overflow Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-09 17:18:01 +01:00
Michael Niedermayer	7ec1fe1f47	lavf: Dont compare absolute to relative timestamps in duration gcd This prevents a division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-09 14:59:43 +01:00
Michael Niedermayer	1b5a6d3c49	Merge remote-tracking branch 'qatar/master' * qatar/master: flacenc: ensure the order is within the min/max range in LPC order search avconv: rescale packet duration to muxer time base when flushing encoders add 24-bit FLAC encoding to Changelog rtpenc_aac: Fix calculation of the header size x86: h264_intrapred: port to cpuflags Conflicts: Changelog libavformat/rtpenc_aac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-09 10:29:51 +01:00
Luca Abeni	e004d175fe	rtpenc_aac: Fix calculation of the header size Previously the high end byte was always set to zero. Also get rid of an unnecessary multiplication (which in practice couldn't overflow) before shifting. Signed-off-by: Martin Storsjö <martin@martin.st>	2012-11-08 19:48:32 +02:00
Michael Niedermayer	5ff43ec72d	sctp: silence const warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-08 16:06:04 +01:00
Michael Niedermayer	60e028958c	ffmdec: remove unused variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-08 15:54:14 +01:00
Luca Abeni	78e08fd340	rtpenc_aac: Fix 10l bug Fixes CID602564 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-08 01:54:16 +01:00
Peter Ross	a373f35272	wtvenc: produce seekable files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-07 13:59:03 +01:00
Peter Ross	b89cd2a028	wtvenc: simplify write_timestamp Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-07 13:51:38 +01:00
Peter Ross	3e65134326	wtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows Media Center expects) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-07 13:45:01 +01:00
Peter Ross	0d9435048c	wtvenc: indent fixup Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-07 13:44:50 +01:00
Peter Ross	b50759cd6b	wtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not required for playback Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-07 13:42:01 +01:00
Paul B Mahol	7c2cfaac6a	smjpegenc: use bits_per_coded_sample instead of calling function Final result is same and this allows support of multiple values per codec. Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-07 01:31:39 +00:00
Nicolas George	e9b8523d52	sbgdec: dont set slide to a uninitialized value Fixed CID703833 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 21:46:22 +01:00
Michael Niedermayer	2ca649f177	utils: fix integer overflow with DURATION_MAX_READ_SIZE Fixes CID703746 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 18:44:14 +01:00
Peter Ross	e6ef628b1e	wtv: move duplicated guids into wtv.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 15:52:33 +01:00
Peter Ross	1701a22fce	wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 15:51:41 +01:00
Peter Ross	9632f5efcf	wtvenc: fix typo Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 15:50:36 +01:00
Michael Niedermayer	2a0dfc51ea	img2enc: support 16bit per sample yuv in split planes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 02:27:04 +01:00
Michael Niedermayer	2c87565147	img2enc: support storing alpha planes too in split plane mode Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 01:42:26 +01:00
Michael Niedermayer	db012e161e	img2enc: Fix yuva with yuv split planes. Previously the chroma planes where corrupted in this case. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 01:31:41 +01:00
Michael Niedermayer	67ee2d2f6d	img2enc: check pix_fmt for split planes mode. Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 01:31:41 +01:00
Michael Niedermayer	6dfcc7abdd	img2enc: ensure that the codec is rawvideo for split planes mode. Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-06 01:31:41 +01:00
Michael Niedermayer	7d26be63c2	Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e' * commit '5ff998a233d759d0de83ea6f95c383d03d25d88e': flacenc: use uint64_t for bit counts flacenc: remove wasted trailing 0 bits lavu: add av_ctz() for trailing zero bit count flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian fate: aac: Place LATM tests and general AAC tests in different groups build: The A64 muxer depends on rawenc.o for ff_raw_write_packet() Conflicts: doc/APIchanges libavutil/version.h tests/fate/aac.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-05 22:51:20 +01:00
Martin Storsjö	f0615557e0	rtmpproto: Use av_strlcat instead of strncat Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Fixes: [FFmpeg-devel] rtmpproto compile error Similar patch: [FFmpeg-devel] [PATCH] call to strncat replaced with av_strlcat to avoid compile issue with systems implementing strncat via strcat.	2012-11-05 21:47:43 +01:00
Paul B Mahol	70727e8774	lavf/avr: make .long_name consistent with others Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-05 20:47:22 +00:00
Michael Niedermayer	282a6308bf	udp: check ff_socket_nonblock() return code Fixes CID733719 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-05 21:21:04 +01:00
Diego Biurrun	92fec47d69	build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()	2012-11-05 20:48:50 +01:00
Michael Niedermayer	30d27685b1	segment: fix null ptr deref Fixes CID732220 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-05 20:26:10 +01:00
Paul B Mahol	962314fe27	AVR demuxer Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-05 17:31:22 +00:00
Piotr Bandurski	461797f6aa	riff: add "lsvm" FourCC for H263.	2012-11-05 17:43:01 +01:00
Michael Niedermayer	9829ec1a9c	ffm: redesign header format to make it extensible Currently FFM files generated with one versions of ffmpeg generally cannot be read by another. By spliting data into chunks, more fields can saftely be appended to chunks as well as new chunks added. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-05 16:36:44 +01:00
Martin Storsjö	d578f94746	rtmp: Use av_strlcat instead of strncat Signed-off-by: Martin Storsjö <martin@martin.st>	2012-11-05 15:37:09 +02:00
Clément Bœsch	a8b3130181	lavf/srtdec: recognize subtitles starting at event index 0.	2012-11-05 07:37:45 +01:00
Michael Niedermayer	e82afa3e2d	filmstripenc: fix rounding that caused fate failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-05 00:28:21 +01:00
Michael Niedermayer	a147c1b2b1	oggenc: remove unneeded null check. The code would have segfaulted before if it where null Fixes CID732218 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-05 00:28:21 +01:00
Paul B Mahol	992a6a53ef	cdxl: add read_probe function Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-04 20:19:43 +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
Paul B Mahol	50d3a1a962	vocenc: fix 10l regression Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-04 04:46:10 +00:00
Paul B Mahol	1c5b56eec7	vocenc: abort if unsupported codec is used Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-04 03:59:08 +00:00
Michael Niedermayer	5f53138621	movenc: remove unneeded check Fixes CID741417 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-04 01:03:52 +01:00
Paul B Mahol	94f224516c	westwood_aud: remove stale comment Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-03 14:54:17 +00:00
Michael Niedermayer	2581d9bcbb	Merge remote-tracking branch 'qatar/master' * qatar/master: doc: add apidoc target for doxygen API documentation matroskadec: do not use avpacket internals Conflicts: doc/Makefile libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-03 14:48:51 +01:00
Michael Niedermayer	37e81996dc	Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f' * commit '9221efef7968463f3e3d9ce79ea72eaca082e73f': lavf: fix av_interleaved_write_frame() doxy. lavf: clarify the lifetime of demuxed packets. avconv: do not free muxed packet on streamcopy. crc: move doxy to the header vf_drawtext: do not use deprecated av_tree_node_size x86: Refactor PSWAPD fallback implementations and port to cpuflags Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-03 14:24:11 +01:00
Michael Niedermayer	b7280cff9a	asfdec: check stream_index for validity Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-03 05:58:12 +01:00
Michael Niedermayer	e5927910c2	asfdec: flip the interpretation of the header aspect back This reverts `2de8877689` Fixes Ticket 1883 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-03 05:49:07 +01:00
Michael Niedermayer	343c73e252	asfdec: parse aspect ratio payload extension Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-03 05:49:07 +01:00
Michael Niedermayer	8c93269e42	asfdec: correctly parse payload extensions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-03 05:37:18 +01:00
Michael Niedermayer	2d8c76eb1f	asfdec: parse payload extension list Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-03 05:35:35 +01:00
Anton Khirnov	9221efef79	lavf: fix av_interleaved_write_frame() doxy. A sentence was mistakenly inserted in the middle of another sentence.	2012-11-02 18:28:56 +01:00
Anton Khirnov	34871beb5e	matroskadec: do not use avpacket internals	2012-11-02 18:28:56 +01:00
Anton Khirnov	717a450993	lavf: clarify the lifetime of demuxed packets.	2012-11-02 18:28:56 +01:00
Paul B Mahol	c39fb30816	smjpegdec: set nb_frames for video stream Signed-off-by: Paul B Mahol <onemda@gmail.com>	2012-11-02 16:32:51 +00:00
Michael Niedermayer	8551c6bec0	Merge remote-tracking branch 'qatar/master' * qatar/master: dv1394: Swap the min and max values of the 'standard' option rtpdec_vp8: Don't parse fields that aren't used lavc: add some AVPacket doxy. audiointerleave: deobfuscate a function call. rtpdec: factorize identical code used in several handlers a64: remove interleaved mode. doc: Point to the new location of the c99-to-c89 tool decode_audio3: initialize AVFrame ws-snd1: set channel layout wmavoice: set channel layout wmapro: use AVCodecContext.channels instead of keeping a private copy wma: do not keep private copies of some AVCodecContext fields Conflicts: libavcodec/wmadec.c libavcodec/wmaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-02 14:57:36 +01:00
Martin Storsjö	2b831a59d9	rtpdec_vp8: Don't parse fields that aren't used This avoids warnings about unused variables. Signed-off-by: Martin Storsjö <martin@martin.st>	2012-11-02 10:59:17 +02:00
Anton Khirnov	fdc8672886	audiointerleave: deobfuscate a function call. right above there is if (pkt) {<do stuff>; pkt = NULL}, so pkt is just a fancy name for NULL at this point.	2012-11-02 07:58:38 +01:00
Anton Khirnov	179a5c37e0	rtpdec: factorize identical code used in several handlers	2012-11-02 07:58:37 +01:00
Anton Khirnov	f70381ab9d	a64: remove interleaved mode. It has been disabled since it was added two years ago.	2012-11-02 07:58:37 +01:00
Jason	a5f6720f13	Add QT CC track mux support Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-02 05:00:27 +01:00
Michael Niedermayer	f742c7b2ce	lavf: fix integer overflow in rfps calculation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-01 21:37:29 +01:00
Michael Niedermayer	bacebe1f95	avienc: force a valid timebase for video Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-01 20:26:59 +01:00
Michael Niedermayer	304ebed586	mpegts_probe: detect files with garbage at the begin. Fixes Ticket1811 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-01 17:22:04 +01:00
Tomas Härdin	84e7d368d6	mxfdec: Fix inferred misuses of enums This fixes CID 700457, 700458 and 703705. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-01 16:21:12 +01:00
Michael Niedermayer	e5cf100d3d	mpegvideo_probe: check slice order Fixes: Enrique.mp3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-11-01 15:08:03 +01:00
Michael Niedermayer	6992b0bfc2	utils: fix rounding of micro seconds Found-by: Johan Wessfeldt <johan.wessfeldt@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-10-31 19:12:47 +01:00
Stefano Sabatini	be0b37c649	lavf/avienc: fix/extend error message, in case of too large number of skipped frames	2012-10-31 14:46:40 +01:00
Stefano Sabatini	f35d5f966f	lavf/avienc: enable debug log	2012-10-31 14:46:24 +01:00
Michael Niedermayer	f7a9a99661	wavenc: fix curruption of metadata Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2012-10-30 21:48:39 +01:00
Michael Niedermayer	a201639a01	Merge remote-tracking branch 'qatar/master' * qatar/master: pixfmt: support more yuva formats swscale: support gray to 9bit and 10bit formats configure: rewrite print_config() function using awk FATE: fix (AD)PCM test dependencies broken in `e519990` Use ptrdiff_t instead of int for intra pred "stride" function parameter. x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes. Conflicts: libavcodec/h264pred.c libavcodec/h264pred_template.c libavutil/pixfmt.h libswscale/swscale_unscaled.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-10-30 17:47:36 +01:00
Michael Niedermayer	6f5f7f705d	Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a' * commit '08b028c18dc31b6de741861b9555669dcca4d12a': Remove INIT_AVX from x86inc.asm. Remove usage of INIT_AVX in h264_intrapred_10bit.asm. dv: fix indentation Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-10-30 15:28:24 +01:00
Michael Niedermayer	e79c3858b3	Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8' * commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8': dv: use AVStream.index instead of abusing AVStream.id lavfi: add ashowinfo filter avcodec: Add a RFC 3389 comfort noise codec lpc: Add a function for calculating reflection coefficients from samples lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients lavr: document upper bound on number of output samples. lavr: add general API usage doxy indeo3: remove duplicate capabilities line. fate: ac3: Add dependencies Conflicts: Changelog doc/filters.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavfilter/Makefile libavfilter/af_ashowinfo.c libavfilter/allfilters.c libavfilter/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-10-30 14:40:22 +01:00

... 7 8 9 10 11 ...

12315 Commits