Commit Graph

8994 Commits

Author SHA1 Message Date
Michael Niedermayer
c0c5189e66 soxdec: check av_malloc return.
Bug found by: durandal_1707

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1dcce49e10)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:56 +01:00
Michael Niedermayer
0ab9072ee0 dsicin demuxer: Fix excessive malloc()
use ffio_limit()
Fixes Ticket 790
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9c5104e84e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:56 +01:00
Michael Niedermayer
3461d27506 lavf: split out ffio_limit()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e39eeb10d1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:56 +01:00
Michael Niedermayer
0815a2907a rl2demux: Fix FPE
Fixes Ticket788
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f371396dfb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
21ca96049f siff: Fix excessive memory allocation.
Bug found by: Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1c73391d7d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
9f1dde03d5 mov: detect EOF in mov_read_dref()
This fixes a (near) infinite loop and Ticket783
Bug found by: cosminamironesei

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit af3f2a87da)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:49:55 +01:00
Michael Niedermayer
cb2d66a470 avienc: Fix rawvideo 32bit
Bug found by: Rik Maes <rik.maes54@gmail.com>
Change based on suggestion by Rik Maes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 53b6503184)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:04:56 +01:00
Michael Niedermayer
c55b158b87 mtvdemuxer: fix segfault caused by truncated packets.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f890cb948c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:02:00 +01:00
Michael Niedermayer
5ca4ec76b7 lavf: print an error if a packet has been truncated due to filesize
in av_get_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee181f84a3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:01:49 +01:00
Michael Niedermayer
813c05fcd2 txd/westwood: remove demuxer specific overallocate solutions as the new generic code
handles it fine.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 207d9eab5a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:01:40 +01:00
Michael Niedermayer
dd5d2de5ec lavf: Update AVIOContext.maxsize when hitting the end.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 559ae20dda)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 19:01:30 +01:00
Michael Niedermayer
c40296d1ad avidec: Check that the header chunks fit in the available filesize.
Fixes Ticket771
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 62adc60b97)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:29:02 +01:00
Michael Niedermayer
cd5d5bf45c txddemux: Limit allocated packets to filesize.
Fixes Ticket772
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f72601d063)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:54 +01:00
Michael Niedermayer
aed8e8f9f3 thp: simplify overallocate checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a000975444)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:45 +01:00
Michael Niedermayer
349cca9f12 lavf: add internal AVIOContext.maxsize
This allows simple and generic limiting of allocations used for packets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 47572323f2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:38 +01:00
Michael Niedermayer
58b65c1241 thpdemux: Check that packed sizes are within the files data size and filesize.
Fixes Ticket774
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 482ee63641)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:26 +01:00
Michael Niedermayer
44e7ef15ae avidec: Fix infinite loop caused by rounding of timestamps in non interleaved avis.
Fixes Ticket775
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e098fba5d9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:28:15 +01:00
Michael Niedermayer
4af03698f3 smackerdemuxer: check some values before instead of just after malloc()
Fixes Ticket777
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c402c1c976)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:27:48 +01:00
Michael Niedermayer
8af76473b3 westwooddemux: dont require avio_size() functionality.
Found by reimar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e2a16e82b1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:27:36 +01:00
Michael Niedermayer
0177ac9637 lavf: Fix fps misdetection when codec_info_duration is 0 and only a few frames are used to estimate fps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d19ca77f42)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:38 +01:00
Michael Niedermayer
17044e1a2b mov: Fix near infinite loop in stsd parsing.
Fixes Ticket768
Bug found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5f95c130a0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:27 +01:00
Michael Niedermayer
19babec06f westwooddemuxer: use av_get_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4255d6d96c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:19 +01:00
Michael Niedermayer
02798736bf westwooddemuxer: Fix 1gb alloc
Fixes Ticket765
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f68b19fc28)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:11 +01:00
Martin Storsjö
3f1e77a44c flvenc: Support muxing 16 kHz nellymoser
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit bd2ff1a8bc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:23:17 +01:00
Shitiz Garg
0c62a00e68 westwood: Make sure audio header info is present when parsing audio packets
Audio header information might get scrambled and would not parse,
yet wsqva_read_packet would try to parse audio packets causing
segfaults such as floating point exception.

Fixes bugzilla #141.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 566ee0eaf1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:19:40 +01:00
Michael Niedermayer
09453e6bd3 mtv: Fix FPE with 0 dimensions.
Fixes Ticket755
Bug Found by: Diana Elena Muscalu

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b9b6332df)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:02 +01:00
Martin Storsjö
bf9af661b8 applehttp: Properly clean up if unable to probe a segment
This avoids a segfault if the probe function wasn't able to
determine the format.

The bug was found by Panagiotis H.M. Issaris.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 115a57302a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:12:33 +01:00
Martin Storsjö
63d5fa55fe applehttp: Avoid reading uninitialized memory
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit c41b9842ce)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:09:56 +01:00
Carl Eugen Hoyos
d344e45f19 Detect 'yuv2' as rawvideo also in avi.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:09:28 +01:00
Derek Buitenhuis
93442a27c5 v410 encoder and decoder
v410 is a packed 10-bit 4:4:4 YCbCr format used in
QuickTime.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 309ffa4fe3)

Conflicts:

	libavcodec/version.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:57:26 +01:00
Reimar Döffinger
97e6a0fa2a Support "VLB " audio in NSV files.
See samples/nsv/vlb_audio.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 36be045ed7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:55:05 +01:00
Anton Khirnov
60cb07196f lavf: add avformat_close_input().
It sets the supplied AVFormatContext pointer to NULL after freeing it,
which is safer and its name is consistent with other lavf functions.

Also deprecate av_close_input_file().
(cherry picked from commit 526604545f)

Conflicts:

	doc/APIchanges
	libavformat/utils.c
	libavformat/version.h
2012-01-03 17:47:08 +01:00
Clément Bœsch
dfdf616773 mp3enc: fix playback with mp3 encoded files on some devices.
This partially reverts 1fea432b; header variable needs to keep its value
in case it triggers "if (needed <= c.frame_size)".
(cherry picked from commit e1a8164d62)

Conflicts:

	libavformat/mp3enc.c
2012-01-03 15:07:45 +01:00
Tomas Härdin
35a42ca0bf mxfdec: Only use the new demuxing logic for OPAtom
This is a stopgap for ticket #746.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:35 +01:00
Michael Niedermayer
f52324629a riff: Fix freeing of random value.
Fixes Ticket752
Bug-found-by: Diana Elena Muscalu
(cherry picked from commit 76b9a0961c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Carl Eugen Hoyos
238c7ffd7d Do not reject LIST tags in wav with size 4.
Fixes ticket #745.
(cherry picked from commit a8e93ce4cb)
2011-12-14 15:18:11 +01:00
Michael Niedermayer
657737e58d clenaup: #ifdec CONFIG*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b39e01a6e8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:46:59 +01:00
Michael Niedermayer
b92ef485c7 Fix all GNU %Ld
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9aeaf62903)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:46:45 +01:00
Tomas Härdin
5693443446 mxfdec: Check slice_count before freeing slice_offset_entries
This fixes SIGSEGV on sliceless (single stream) VBR files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 89cc8c17df)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:33:24 +01:00
Tomas Härdin
57111c558e mxfdec: Bring back accumulated_offset that was removed in 5e67e3e
I thought it had to do with file offsets, but's actually the offset inside
the essence container.
In other words, unbreak multiple EditUnitByteCounts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c0ee522df6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:33:15 +01:00
Michael Niedermayer
7881dad2b2 seek-test: use standard format specifiers in snprintf()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cd2f7ed000)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 02:05:12 +01:00
Michael Niedermayer
16abd68779 seektest: floatfree
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 19:21:39 +01:00
Reimar Döffinger
c3068d43a8 Support VP8 in NSV.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-11 18:16:55 +01:00
Michael Niedermayer
964912aba5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  Warn about avserver being broken.
  avconv: drop code for special handling of avserver streams.
  rawdec: don't set codec timebase.
  lavf doxy: add muxing stuff to lavf_encoding group
  lavf doxy: add demuxing stuff to lavf_decoding group
  lavf doxy: expand/reword metadata API doxy.
  lavf doxy: add installed headers to groups.
  lavf doxy: add avio groups into the lavf_io group.
  lavf doxy: rename lavf I/O group to lavf_io.
  lavf doxy: add metadata docs to the main lavf group
  ttadec: check channel count as read from extradata.
  Add CLJR encoding and decoding regression tests
  cljr: remove unused code
  flacdec: Support for tracks in cuesheet metadata block
  ptx: fix inverted check for sufficient data
  flac muxer: fix writing of file header and STREAMINFO header from extradata
  ptx: emit a warning on insufficient picture data
  utvideo: add fate tests covering all codec variants
  doc: update to refer to avconv
  doc: remove some stale entries from the faq
  ...

Conflicts:
	Changelog
	avconv.c
	doc/avconv.texi
	doc/faq.texi
	doc/ffplay.texi
	doc/ffprobe.texi
	doc/ffserver.texi
	libavcodec/avcodec.h
	libavcodec/cljr.c
	libavformat/avformat.h
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-11 01:05:33 +01:00
Anton Khirnov
e745d7525a rawdec: don't set codec timebase.
It's not supposed to be set outside of lavc. Set r_frame_rate and
avg_frame_rate instead.
2011-12-10 22:02:44 +01:00
Anton Khirnov
489a7b07e9 lavf doxy: add muxing stuff to lavf_encoding group 2011-12-10 22:02:28 +01:00
Anton Khirnov
370f27dee3 lavf doxy: add demuxing stuff to lavf_decoding group 2011-12-10 22:02:28 +01:00
Anton Khirnov
28b4c06b9d lavf doxy: expand/reword metadata API doxy. 2011-12-10 22:02:28 +01:00
Anton Khirnov
eca06cbed9 lavf doxy: add installed headers to groups. 2011-12-10 22:02:28 +01:00
Anton Khirnov
fb42db7c39 lavf doxy: add avio groups into the lavf_io group. 2011-12-10 22:02:28 +01:00