virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
57,350 Commits 37 Branches 400 Tags 460 MiB
3d3a7f5034
Commit Graph

25763 Commits

Author SHA1 Message Date
Michael Niedermayer
435a730e21 avcodec/aacdec: fix more avpriv_report_missing_feature() arguments 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 10:57:16 +02:00
Michael Niedermayer
72cf47b241 avcodec/aacdec: fix avpriv_report_missing_feature() arguments 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 10:45:50 +02:00
Michael Niedermayer
fdb4822559 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).

Conflicts:
	Changelog
	libavcodec/aacdec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 10:02:43 +02:00
Michael Niedermayer
e0f2918223 Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7' 
* commit 'f457edb69794c7e13b3630456d72f7942fff19f7':
  aacdec: Use avpriv_report_missing_feature() instead of custom logging.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 09:53:57 +02:00
Alex Converse
b3be41ca82 aac: Add support for Enhanced AAC Low Delay (ER AAC ELD). 
This does not include support for LD SBR, epTool, data resilience, nor
the 960 transform family.
 2013-10-23 00:08:29 -07:00
Alex Converse
f457edb697 aacdec: Use avpriv_report_missing_feature() instead of custom logging. 2013-10-23 00:08:29 -07:00
Michael Niedermayer
60ea0a5236 avcodec/sgi: Fix dereferencing uninitialized pointer 
This also fixes the code so it decodes raw images correctly again
No release is affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 02:49:45 +02:00
Michael Niedermayer
610a8b1537 avcodec/hevc/extract_rbsp: fix error return type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 20:31:49 +02:00
Mickaël Raulet
0c8aba3842 hevc: add wavefront parallel processing 
cherry picked from commit b971f2c8fdc60f8bab605a6e8060492eb548a53a
cherry picked from commit e57b0a2c915ce6b8a9d57b8292f6581f0680842e

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 20:20:40 +02:00
Mickaël Raulet
e146c326b9 avcodec/pthread: add wpp api 
cherry picked from commit c7765f3295fe7dc0653161c6a3d3e1778b76ee67
cherry picked from commit 0008c4979fc1d1bc24d4d2c791715f6dd017563c

Conflicts:

	libavcodec/utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 19:55:47 +02:00
Michael Niedermayer
4aeafbaab8 Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991' 
* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
  h264_parser: Use ff_h264_reset_sei()

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 19:19:28 +02:00
Hendrik Leppkes
c2f3715cb3 vp9: always consume the full input packet 
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 18:52:40 +02:00
Michael Niedermayer
88c27193c7 avcodec/vcr1: print the actual size when its insufficient 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 18:09:20 +02:00
Michael Niedermayer
77ef538818 avcodec/vcr1: Fix bitstream input size check 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 18:09:20 +02:00
Michael Niedermayer
da30d0cec3 libavcodec/mpegaudio_tablegen: clip value before casting 
Avoids FPE on alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 12:48:47 +02:00
Yusuke Nakamura
103d073dd7 h264_parser: Use ff_h264_reset_sei() 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:55:22 +02:00
Michael Niedermayer
19f5384000 h264_parser: Fix order of operations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:53:04 +02:00
Mickaël Raulet
c68faca68e hevc: fix transform_skip which is only valid for 4x4(cherry picked from commit 740e5a71e5121dbf3fabdc4fec97829c18ecc2d8) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 08:41:14 +02:00
Mickaël Raulet
1c8de4dd94 hevc: pretty print(cherry picked from commit 6332b3afe298b9e1060e8549aea3aa2771b43f5d) 
Conflicts:

	libavcodec/hevc.h
	libavcodec/hevc_filter.c
	libavcodec/hevc_refs.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 08:41:14 +02:00
Mickaël Raulet
a8fafa8978 hevc: cleaning disable field in deblocking filter(cherry picked from commit 7dd7a27ae850a51b3c9cd07046c422677398f6d5) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 08:41:14 +02:00
Mickaël Raulet
1912842045 hevc: remove disable_au option(cherry picked from commit e90b3f6753d645fec076e951a0597a5dc2d2fe31) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 08:41:14 +02:00
Michael Niedermayer
d47e14b53a h263dec: use init_get_bits8() and check its return code 
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 23:37:49 +02:00
Michael Niedermayer
2444fca523 Merge commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b' 
* commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b':
  pthread: Avoid spurious wakeups

See: e3329474a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 19:51:21 +02:00
Ben Jackson
5152196b2b pthread: Avoid spurious wakeups 
pthread_wait_cond can wake up unexpectedly (Wikipedia: Spurious_wakeup).

The FF_THREAD_SLICE thread mechanism could spontaneously execute
jobs or allow the caller of avctx->execute to return before all
jobs were complete.

Test both cases to ensure the wakeup is real.

Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-21 15:28:03 +02:00
Mickaël Raulet
09ba986cae avcodec/hevc: fix duplicate/wrong nal unit check and difference to openhevc_upstream 
NAL_BLA_W_RADL instead of NAL_BLA_N_LP

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 10:48:24 +02:00
Ronald S. Bultje
fed483f188 avcodec/vp9dsp: fix overwrite by 1 in vert_left pred. 
The memset following the memcpy was silencing the problem since
re-writing that same byte.

Fixes CID1108597, CID1108598, (16x16)
      CID1108599, CID1108600, (8x8)
      CID1108601, CID1108602  (32x32)

Signed-off-by: Clément Bœsch <u@pkh.me>
 2013-10-20 21:16:53 +02:00
Marton Balint
b2d9790c2b lavc: make avcodec_decode_subtitle2 more robust 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 20:35:31 +02:00
Michael Niedermayer
f198efb179 avcodec/vp9: Add asserts to help source code analyzers 
See CID1108596 and CID1108595
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 14:46:23 +02:00
Reimar Döffinger
c9a22d69af hevc: Initialize sample aspect to valid value. 
Without this, it is 0/0 by default, which is not allowed.
This sets it to 0/1, which means "undefined".

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-10-20 12:17:09 +02:00
Mickaël Raulet
1b5a52f425 hevc: pretty print(cherry picked from commit 64a4b623b7d66dfc0f3883e5f1d9125c00c3b18c) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 11:08:41 +02:00
Mickaël Raulet
c841d02c05 hevc: fix PPS_A_qualcomm_7(cherry picked from commit 2af177a8761c88eb477a658eebcf4264068aa773) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 11:08:32 +02:00
Michael Niedermayer
2e9b79fc00 avcodec/wavpackenc: fix uninitialized ret 
Fixes CID1108609

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 02:39:32 +02:00
Michael Niedermayer
6338f1b3c0 avcodec/tiff: remove byte based bpp special case 
This case does not work as off is uninitialized and it should be
handled fine by the generic code below

Fixes CID1108608

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 01:50:34 +02:00
Michael Niedermayer
23d69b158a avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame() 
Fixes CID1108577

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 00:41:00 +02:00
Michael Niedermayer
f2eca8d060 avcodec/hevc: do not dereference pointer before null check in verify_md5() 
Fixes: CID1108607

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 00:35:18 +02:00
Michael Niedermayer
acecd6b4d7 avcodec/hevc_cabac: trivial simplifications 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 00:33:29 +02:00
Mickaël Raulet
b5d197a38b hevc: inline cabac in hls_mvd_coding(cherry picked from commit ad387195ad04e8a005a1bfd509e9e4f827e68fa9) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 00:31:33 +02:00
Mickaël Raulet
92a97d1168 hevc: inline cabac in residual coding(cherry picked from commit 17d7a880445b72feb36d684ae1f0597195811e97) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 00:31:25 +02:00
Michael Niedermayer
4c67ed8705 avcodec/hevc: fix EOB/EOS check 
Fixes: CID1108575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 00:23:48 +02:00
Michael Niedermayer
9c0fe487c7 avcodec/h264_parser: fix order of operations 
Fixes CID1108576

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 23:44:34 +02:00
Michael Niedermayer
62533eab6f ffv1enc: use 64bit in maxsize calculation 
This isnt needed but it cant hurt, its also more consistent with
how its calculated a few lines before.

See: CID1108593
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 23:36:35 +02:00
Michael Niedermayer
80b1e1c03d avcodec/exr: fix null pointer dereference 
Fixes CID1108582

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 23:28:08 +02:00
Michael Niedermayer
d0812f91c8 avcodec/exr: favor av_freep() over av_free() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 23:27:36 +02:00
Michael Niedermayer
838f461b07 avcodec/utils: add some saftey checks to add_metadata_from_side_data() 
This fixes potential overreads with crafted files.

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 17:58:47 +02:00
Michael Niedermayer
240fd8c96f avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 17:58:47 +02:00
Michael Niedermayer
d5ec8ba7f2 Do not leave positive values undefined when negative are defined as error 
Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 16:42:57 +02:00
Carl Eugen Hoyos
10c240a085 avcodec: Add little-endian G726 decoder 
Fixes part of Ticket1955
suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-18 16:46:08 +02:00
Clément Bœsch
0bf8580354 avcodec/hevcpred: fix make checkheaders. 2013-10-17 21:35:40 +02:00
Mickaël Raulet
a7e300649a hevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a444516f338424d062c0ef2806714036283603b) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 02:42:11 +02:00
Mickaël Raulet
b494894390 hevc: optimize residual coding(cherry picked from commit 70692a44708157b4dfa50e402e446bfa2b27f55e) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-17 02:41:51 +02:00