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
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
Ronald S. Bultje
734ccf3785
avcodec/vp9: fix band_counts array size / padding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 17:17:47 +02:00
Paul B Mahol
4413dcc035
avcodec/exr: piz decompression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-16 14:54:59 +00:00
Michael Niedermayer
4d41a25d39
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: Move 8x8 in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 15:08:10 +02:00
Michael Niedermayer
8210e38461
Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD
...
* commit '95587859cc69e5abe37c9e3af48008032d98e262':
mpegvideo: Move obmc in a separate function
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 14:51:00 +02:00
Michael Niedermayer
8610751d07
Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'
...
* commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
mpegvideo: K&R formatting cosmetics
Conflicts:
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 13:54:41 +02:00
Michael Niedermayer
10c6d1b28c
Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'
...
* commit '93f305473f880729d18b5e42067f19d2106cb2e5':
lavc: Convert some remaining strides to ptrdiff_t
Conflicts:
libavcodec/h264.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/vp56.c
libavcodec/wmv2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 13:08:37 +02:00
Michael Niedermayer
f7f74a37b8
Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'
...
* commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 12:51:26 +02:00
Michael Niedermayer
91248f081f
Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'
...
* commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 12:39:02 +02:00
Michael Niedermayer
3a8b52c011
Merge commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8'
...
* commit '3b4fa54866f58bf3d8a8dcc460c73ef6564c0ad8':
cavs: more K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 11:12:23 +02:00
Mickaël Raulet
64b3aaf8f6
hevc: fixing TSCL_A_VIDYO_5 decoding output order(cherry picked from commit 19c5d9ed28606e7a166d180fc9f1517cb174146f)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 01:48:11 +02:00
gcocherel
cf49d0156d
valgrind cleanup(cherry picked from commit 0d5efa40b94c0de92a1fe5091b21e0e2d36bae3d)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 00:17:28 +02:00
Luca Barbato
825c7c62bb
mpegvideo: Move 8x8 in a separate function
2013-10-15 23:58:20 +02:00
Luca Barbato
95587859cc
mpegvideo: Move obmc in a separate function
2013-10-15 23:58:20 +02:00
Luca Barbato
a84616b736
mpegvideo: K&R formatting cosmetics
2013-10-15 23:58:20 +02:00
Ronald S. Bultje
93f305473f
lavc: Convert some remaining strides to ptrdiff_t
2013-10-15 23:58:20 +02:00
Luca Barbato
a90905db2e
ffv1: Assume bitdepth 0 means 8bit
...
CC: libav-stable@libav.org
Reported-by: debian/726189
2013-10-15 23:58:20 +02:00