Commit Graph

16693 Commits

Author SHA1 Message Date
Michael Niedermayer
e7cb6e1c04 j2kdec: Fix integer overflow leading to a segfault
Fixes Ticket776
Bug found by: Diana Elena Muscalu

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:27:59 +01:00
Carl Eugen Hoyos
7d96f764d6 Fix typo in v210 decoder options.
(cherry picked from commit 56669837ce)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:26:57 +01:00
Michael Niedermayer
134b7f57db smacker: Check for overread in smka_decode_frame()
Fixes a segfault with wetlog_fail.smk
Bug found by: Shitiz Garg

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:26:09 +01:00
Carl Eugen Hoyos
56e2190e10 Fix linesize for bmp with bitdepth < 8.
Fixes ticket #751.
(cherry picked from commit 6f2054c589)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:25:03 +01:00
Michael Niedermayer
54aa78adaa h264: fix midstream extardata handling with dump.f4v
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a4755df523)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:24:36 +01:00
Mans Rullgard
923deca05f v410enc: fix output buffer size check
The encoder clearly needs width * height * 4 bytes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dabba0c676)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:22:26 +01:00
Michael Niedermayer
d1f74d838e jpegdec: check return value of mjpeg_decode_dc()
Fixes Ticket754

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:20:43 +01:00
Michael Niedermayer
07892e33ef h264: Fix build with --disable-everything --enable-decoder='h264' --disable-optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d998a6ddee)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:20:34 +01:00
Martin Storsjö
1804becb30 libgsm: Reset the MS mode of GSM in the flush function
The mode is set in libgsm_decode_init, but the decoder
object is simply destroyed and recreated in the flush
function - therefore the mode has to be set again.

This fixes playback using the libgsm_ms decoder in avplay.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:19:22 +01:00
Martin Storsjö
a11c9d7778 libgsm: Set options on the right object
This fixes regressions in decoding using the libgsm_ms decoder,
broken since 0eea212943.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:39 +01:00
Michael Niedermayer
1d23f5bbef h263dec: Fix regression / crash with lowres.
Fixes Ticket757
Bug Found by: ami_stuff

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:13 +01:00
Michael Niedermayer
c0ff6b6378 flicvideo: input buffer pointer checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 30b996d443)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:18:01 +01:00
Michael Niedermayer
6a805e5334 flicvideo: fix overread.
Bug Found by: Diana Elena Muscalu

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:50 +01:00
Michael Niedermayer
6b7a14e599 aacsbr: Fix memory corruption.
Fixes Ticket760 and Ticket761
Bug Found by: Diana Elena Muscalu

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:42 +01:00
Michael Niedermayer
b6c19c9c91 h264: check chroma_format_idc range.
Fixes Ticket758
Bug found by: Diana Elena Muscalu

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:26 +01:00
Michael Niedermayer
e8bd1af095 indeo3: check return values of allocate_frame_buffers()
Bug Found by: Diana Elena Muscalu

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 18:17:07 +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
Gaurav Narula
399e5b675b ulti: Fix invalid reads
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a99273ebf3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:52:21 +01:00
Michael Niedermayer
0a2fbb0a84 msrledec: Check for overreads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 53be37e368)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:51:52 +01:00
Michael Niedermayer
b4ad641334 aascdec: Check input buffer size on raw data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be5db7004f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:51:42 +01:00
Michael Niedermayer
c30e59383b cljrdec: improve scaling somewhat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7e5cbb3c2d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:20:40 +01:00
Michael Niedermayer
b9e09c9eab cljrenc: fix scaling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a1ca45317d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 17:20:31 +01:00
Michael Niedermayer
46d0aee3c4 lavc: Do not fail audio decoding if user has set a custom get_buffer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3846e3eba)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 15:07:45 +01:00
Carl Eugen Hoyos
55e2dc7f77 Fix channel order for some less common TrueHD layouts.
Reported and tested by TDiTP_

Fixes ticket #779.
(cherry picked from commit 1af0ace3a4)
2012-01-03 14:05:30 +01:00
Hendrik Leppkes
a46fa584c5 mlpdec: fix channel order for wide 7.1 truehd layouts
(cherry picked from commit b9d8af0327)
2012-01-03 14:05:21 +01:00
Carl Eugen Hoyos
980e4263bc Add missing PIX_FMT_NONE to libopenjpegenc
fixes ticket #813

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ef611095f0)
2012-01-03 13:54:11 +01:00
Michael Niedermayer
2a442eb70f h264: Fix frame sync / random access handling.
It seems I have misunderstood the spec when I implemented this
originally.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ba43e50ef)
2012-01-03 13:34:37 +01:00
Michael Niedermayer
23ed56d307 h264: Fix seeking in 00017.MTS
Fixes Ticket852

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9d9316ae34)
2012-01-03 13:34:30 +01:00
Michael Niedermayer
b84683a906 h264: Fix recovery_frame initialization when recovery_frame is -1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fba6777363)
2012-01-03 13:34:27 +01:00
Michael Niedermayer
01ff5378f0 h264: reset picture->sync on allocation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 36fa781bd6)
2012-01-03 13:34:23 +01:00
Michael Niedermayer
96545777d7 h264: add forgotten \n to "Invalid mix of idr and non-idr slices"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ecb14b8af7)
2012-01-03 13:34:15 +01:00
Michael Niedermayer
1506becf36 h264: Print pass in NAL debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 393253b4b3)
2012-01-03 13:26:56 +01:00
Michael Niedermayer
7614facf8a h264: fix init of topleft ref/mv.
Fixes Ticket778

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4d70023a2a)
2011-12-18 02:10:59 +01:00
Michael Niedermayer
de69052b1a ljpeg: Check that lowres is 0 as lowres is not possible with ljpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
bf928ebed2 4xm: check if there are bits left in decode_i_block()
Fixed Ticket753
Bug Found by: Diana Elena Muscalu

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Matthieu Bouron
6db6fe82ca mpeg12enc: fix drop_frame_timecode value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 366605ff5d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Michael Niedermayer
388e3e7853 ac3dec: update checked AV_EF flags.
A user who wishes to use default error concealment cannot set the
AV_EF_CRCCHECK flag because not every CRC in every format is a
reliable indicator of bitstream damage. In some formats crcrs
can be nonsensical in absence of any damage. We thus add the
AV_EF_CAREFUL flag in addition to the AV_EF_CRCCHECK flag to
allow a user to enable this reliable CRC check without having to
enable all CRC checks in all formats.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 15:21:19 +01:00
Carl Eugen Hoyos
866d5c958f Export ff_vdpau_vc1_decode_picture().
XBMC's configure script checks for this function in installed
libavcodec.so to determine VDPAU support.

Fixes ticket #762 reported by Christian Marillat
(cherry picked from commit 9994643fdd)
2011-12-16 02:36:51 +01:00
Michael Niedermayer
834aef341d cleanup: for(int
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 16b771b1f4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:47:01 +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
Michael Niedermayer
6289b6c811 twinnvq: remove ;;
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 35f707abe1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 21:46:43 +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
Michael Niedermayer
3dea28cc2e h264: Fix concealment regression introduced by babf4fe01a
Limit the new case to when the decoder is flushed instead of at each idr frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10 23:26:38 +01:00
Michael Niedermayer
8743400961 h264: reset prev_poc_msb to the same value everywhere.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10 23:03:49 +01:00
Shitiz Garg
8bd1f1a4c8 ttadec: check channel count as read from extradata.
fixes floating-point exception due to channels being set to 0.
fixes Bug 128.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2011-12-10 14:54:19 -05:00
Paul B Mahol
65c1011404 cljr: remove unused code
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-12-10 20:11:28 +01:00
Michael Niedermayer
cc61643123 h264: improve "no picture" debug output.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10 18:51:48 +01:00
Michael Niedermayer
5b2873c1d5 h264: switch from qatars has_b_frames calculation back to mine.
Their 2nd try does like the first not work at all.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-10 18:51:48 +01:00