RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
57,477 Commits 36 Branches 392 Tags 310 MiB
Commit Graph

57477 Commits

Author SHA1 Message Date
Michael Niedermayer 3e1483d03e Merge commit '19f53840001a7afcdb57b2a797e363ec8081aba3' 
* commit '19f53840001a7afcdb57b2a797e363ec8081aba3':
  h264_parser: Fix order of operations

See: 9c0fe487c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 19:15:19 +02:00
Michael Niedermayer cf47a6a1a0 Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' 
* commit 'f825d42bccdb9f89669a586951de7f66a81e80a5':
  avplay: Accept cpuflags option

Conflicts:
	cmdutils_common_opts.h
	doc/ffmpeg.texi
	doc/fftools-common-opts.texi
	ffmpeg_opt.c

See: 1060e9ce54
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 19:07: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
Derek Buitenhuis b1fcdc08ce nut: Fix unchecked allocations 
CC: libav-stable@libav.org
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:09:56 +01: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
Derek Buitenhuis 55ae13e3de nut: Fix unchecked allocations 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:08:10 +01:00
Derek Buitenhuis 692b930904 lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups 
This is similar to 5152196b2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:05:26 +01:00
Derek Buitenhuis 3511d4fc97 pthread: Avoid crashes/odd behavior caused by spurious wakeups 
This is similar to 5152196b2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 13:24:01 +01: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
Vittorio Giovara 157dc0b489 fate: add fieldorder filter test 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:59:03 +02:00
Vittorio Giovara 00d7369de0 vf_fieldorder: log when processing is skipped 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:58:25 +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
Luca Barbato f825d42bcc avplay: Accept cpuflags option 
Quite useful for debugging.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:49:31 +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 23c0698499 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavf/tee: fix leak of bsfs array.
  lavf/tee: fix leak of select option.
  lavf/tee: fix leak of strdup/strtoked buffer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 23:50:07 +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 7e3e653618 avformat/bintext: protect against potential overflow of chars_per_frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 23:37:49 +02:00
Paul B Mahol c9660999b9 avfilter: replaygain scanner 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 19:56:55 +00:00
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
Nicolas George c4e6024adc lavf/tee: fix leak of bsfs array. 2013-10-21 17:32:01 +02:00
Nicolas George 5a12142aca lavf/tee: fix leak of select option. 2013-10-21 17:32:01 +02:00
Nicolas George 59f809e992 lavf/tee: fix leak of strdup/strtoked buffer. 
Fix CID 1108606.
 2013-10-21 17:32:01 +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