generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
57,301 Commits 24 Branches 241 Tags 173 MiB
2f9422d951
Commit Graph

57301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
2f9422d951 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avio: Use AVERROR_PROTOCOL_NOT_FOUND

Conflicts:
	libavformat/avio.c

See: 12eeced8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 20:12:33 +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
Michael Niedermayer
e45460aab0 Merge commit '23e6d3d4e27c83e06d00aa072c84d057bd1dad23' 
* commit '23e6d3d4e27c83e06d00aa072c84d057bd1dad23':
  fate: vpx: Remove one redundant $(eval) invocation

Merge for meta data only as this breaks the affected fate tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 19:47:27 +02:00
Michael Niedermayer
ab2bfb85d4 avfilter/ff_insert_pad: fix order of operations 
Fixes out of bounds access
Fixes CID732170
Fixes CID732169

No filter is known to use this function in a way so the issue can be reproduced.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 16:43:25 +02:00
Paul B Mahol
c655216939 make it possible to compile ffmpeg without swscale 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 13:57:00 +00:00
Luca Barbato
ea71aafd68 avio: Use AVERROR_PROTOCOL_NOT_FOUND 
When the protocol is missing ffurl_alloc() should return
AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).

Bug-Id: 577
CC: libav-stable@libav.org
 2013-10-21 15:55:20 +02:00
Paul B Mahol
f5ed83c383 avformat/mxfdec; parse random index pack to get last partition offset and use it when footer partition offset is missing 
Footer partition may not be present and even if present footer partition
offset may not be set in any partition except last one.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 13:29:30 +00: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
Michael Niedermayer
80b8f78048 fate: enable hevc tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 14:22:41 +02:00
Carl Eugen Hoyos
87eae03aac Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux. 2013-10-21 13:49:30 +02:00
Stefano Sabatini
ddaf33f5bb ffprobe: fix consistency checks in parse_read_intervals() 
Move array size assert after the count increment, and avoid strchr() NULL
dereference on p.

Should fix FFmpeg coverity issue #1108581.
 2013-10-21 13:33:06 +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
Michael Niedermayer
712eff4978 fate: add synthetic swresample resampling tests 
this is based on libavresample.mak

These tests do not depend on external samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 00:12:06 +02:00
Clément Bœsch
4189fe11ff avformat/vobsub: fix invalid sub queue access while seeking. 
If there is only 1 stream and seek isn't called with a specific stream
index, we pick the first (and only) one.

Regression since dbfe6110.

Fixes CID1108591.
 2013-10-20 21:23:46 +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
Lukasz Marek
36d0b15b4e MAINTAINERS: add lavd/fbdev_enc entry 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-20 19:23:31 +02:00
Lukasz Marek
d1f383341f lavd/pulse_audio_enc: add support for flushing 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-20 19:15:30 +02:00
Michael Niedermayer
2d8ccf0adc avutil/opt: initialize ret 
Fixes CID1108610
Fixes use of uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 18:38:48 +02:00
Michael Niedermayer
ad28fe35c5 avutil/file_open: Print debug message if setting close on exec fails 
Fixes CID1087079
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 18:36:09 +02:00
Michael Niedermayer
88d4ff4b5f avformat/utils: Check av_packet_new_side_data() return before using it 
Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 18:33:53 +02:00
Michael Niedermayer
eb5cc8febc avformat/oggparsespeex: Check for extradata allocation failure 
Fixes CID1108574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 16:57:45 +02:00
Michael Niedermayer
2c1e075308 avformat/oggparseflac: check ff_alloc_extradata() return code 
Fixes CID1108573
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 16:55:43 +02:00
Michael Niedermayer
b294a4beec avformat/oggparsecelt/celt_header: fix memleak 
Fixes: CID1108605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 16:48:51 +02:00
Michael Niedermayer
baab248c49 avformat/network: check for fcntl() failure in ff_socket() 
Fixes: CID1087075
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 16:34:32 +02:00
Michael Niedermayer
78e6f83ce0 avformat/au: add assert to help source code analyzers 
See: CID1108585 and CID1108603
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-20 14:46:36 +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
6838e1f547 avformat/oggdec: favor av_freep() over av_free() 
Found-by: Reimar Döffinger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 22:50:16 +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
Michael Niedermayer
a6388616e8 doc/developer: Add a policy item about updating the MAINTAINERs file 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 15:20:03 +02:00
Diego Biurrun
23e6d3d4e2 fate: vpx: Remove one redundant $(eval) invocation 2013-10-19 15:09:29 +02:00
Michael Niedermayer
fec6d547cc avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro 
it just wraps around a bitwise shift, and makes the code harder to read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 11:24:20 +02:00
Michael Niedermayer
2a5f4c1ea2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  wtv: Seek by sector properly

Conflicts:
	libavformat/wtvdec.c

See: a0d13d84a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 11:11:34 +02:00