generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
70,289 Commits 24 Branches 241 Tags 173 MiB
e2edb10f8e
Commit Graph

70289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
9ad8f55eda Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41' 
* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
  qsv: Skip qsv.h compilation if qsv is not enabled

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:49:51 +01:00
Michael Niedermayer
83f18410bd Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d' 
* commit 'cdcc370293a159c321e41af7f0eef141c62d698d':
  rtsp: punch holes again after pause

See: 22bb5bd7a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:43:18 +01:00
Michael Niedermayer
cce8f750d9 Merge commit '061c489895d29049a88dc6118e4b639a273b31d6' 
* commit '061c489895d29049a88dc6118e4b639a273b31d6':
  eamad: check for out of bounds read

Conflicts:
	libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:29:35 +01:00
Michael Niedermayer
92ec34707f Merge commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf' 
* commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf':
  mdec: check for out of bounds read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:19:00 +01:00
Michael Niedermayer
596f81c75b Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc' 
* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
  rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

Conflicts:
	libavformat/rtpdec_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 21:01:44 +01:00
Michael Niedermayer
34a8de866f avcodec/snowenc: Allocate and reference coded_frame correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 19:47:04 +01:00
Michael Niedermayer
96e7c9cbfc avcodec/roqvideoenc: Allocate and reference coded_frame correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 19:45:23 +01:00
Michael Niedermayer
6c9537b807 avformat/hlsenc: Warn if a non file protocol is used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 16:53:36 +01:00
Diego Biurrun
ce52869c22 fate: Rename fate-dts test to fate-dca-core 
The codec is referred to as DCA in other parts of libav.
 2015-02-23 16:26:32 +01:00
Diego Biurrun
cb4cb7b0ea qsv: Skip qsv.h compilation if qsv is not enabled 2015-02-23 16:26:32 +01:00
Paul B Mahol
665916ffa2 avcodec/hqx: remove superfluous log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-23 15:04:15 +00:00
Gilles Chanteperdrix
cdcc370293 rtsp: punch holes again after pause 
When a client behind a NAT issues a pause command, and stay paused for a
long time, the router may stop the RTP/RTCP port redirection. Resend the
hole punching packets before each PLAY command to cause the router to
restart the port redirection in that case.

Move the existing code for sending the packets from the SETUP phase
to the PLAY phase.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-23 16:55:56 +02:00
Federico Tomassetti
061c489895 eamad: check for out of bounds read 
Bug-Id: CID 1257500
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-23 15:06:18 +01:00
Federico Tomassetti
161442ff2c mdec: check for out of bounds read 
Bug-Id: CID 1257501
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-23 15:06:18 +01:00
Martin Storsjö
fe208ca54b rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units 
Only the first aggregation unit has 2 bytes (DONL) prepended, if
such a field is in use.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-23 15:33:20 +02:00
Clément Bœsch
c3d40e305c avfilter/palette{gen,use}: add Copyright 2015-02-23 14:00:13 +01:00
Michael Niedermayer
2cf521718d Merge commit '35c6ce76b107225a19eb33aea38857d2405882af' 
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 12:19:26 +01:00
Michael Niedermayer
c0f02b2201 Merge commit '36a6fb989b017898041703025ef20028146675a8' 
* commit '36a6fb989b017898041703025ef20028146675a8':
  hevc_deblock: Fix compilation with nasm

See: c75fdee747
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 11:53:51 +01:00
Michael Niedermayer
96b495f443 Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a' 
* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
  libschroedinger: Check memory allocations

Conflicts:
	libavcodec/libschroedinger.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 11:42:16 +01:00
Michael Niedermayer
0425e16d96 Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f' 
* commit '521979e6b1e7a89751aebc285a40d6508f8af48f':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
	configure

See: f514b5dff7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 11:26:49 +01:00
Michael Niedermayer
69c32456a0 Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7' 
* commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7':
  configure: Use pkg-config for libdc1394 discovery

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 11:10:56 +01:00
Clément Bœsch
92b7f56193 avfilter/paletteuse: add diff_mode 2015-02-23 09:56:22 +01:00
Clément Bœsch
b0f5227558 avfilter/paletteuse: fix error dithering accuracy 2015-02-23 09:56:22 +01:00
Michael Niedermayer
29bbc1be48 avcodec/a64multienc: Assert that the Packet size does not grow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 02:16:00 +01:00
Michael Niedermayer
4da351ff0c avcodec/a64multienc: simplify frame handling code 
This also fixes a memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 02:15:38 +01:00
Andreas Cadhalpun
87513d6545 avcodec/a64multienc: fix use of uninitialized values in to_meta_with_crop 
Averaging over 2 pixels doesn't work correctly for the last pixel, because the
rest of the buffer is not initialized.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 01:49:23 +01:00
Andreas Cadhalpun
ab759f8f4a avcodec/a64multienc: initialize mc_meta_charset to zero 
This fixes the use of uninitialized values in avpriv_do_elbg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 01:49:23 +01:00
Michael Niedermayer
d96142e9af avcodec/a64multienc: don't set incorrect packet size 
This fixes invalid reads of the packet buffer in av_dup_packet

Based on patch by Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 01:49:23 +01:00
Andreas Cadhalpun
39e4ed7c1d avcodec/a64multienc: use av_frame_ref instead of copying the frame 
This fixes freeing the frame buffer twice on cleanup leading to a crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 00:46:00 +01:00
Michael Niedermayer
fab8b88a5e Merge commit 'a388e72d1a6b0888cc1591cb699f61a9c1089cf4' 
* commit 'a388e72d1a6b0888cc1591cb699f61a9c1089cf4':
  rtpenc_hevc: Aggregate multiple NAL units into one RTP packet, if possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 00:29:50 +01:00
Michael Niedermayer
17c52d746c Merge commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159' 
* commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159':
  rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-23 00:13:23 +01:00
Michael Niedermayer
db4a2976f6 Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7' 
* commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7':
  rtpdec: DV depacketizer (RFC 6469)

Conflicts:
	Changelog
	libavformat/Makefile
	libavformat/rtpdec_dv.c
	libavformat/version.h

See: cbe508553a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 23:54:34 +01:00
Vittorio Giovara
35c6ce76b1 Canopus HQX decoder 
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
 2015-02-22 22:42:27 +00:00
Carl Eugen Hoyos
36a6fb989b hevc_deblock: Fix compilation with nasm 
CC: libav-stable@libav.org
Bug-Id: 795
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-22 22:34:20 +00:00
Vittorio Giovara
e570f895cd libschroedinger: Check memory allocations 2015-02-22 22:32:18 +00:00
Vittorio Giovara
521979e6b1 configure: Properly fail when libcdio/cdparanoia is not found 2015-02-22 22:31:54 +00:00
Vittorio Giovara
f7cc6627c0 configure: Use pkg-config for libdc1394 discovery 
Since not all systems need the libraw1394 dependency, let pkg-config
provide the list of libraries actually needed.

The libdc1394-2.pc file has been included since version 2 (2008-01-05),
so it should be safe to use.
 2015-02-22 22:30:35 +00:00
Michael Niedermayer
0a32a1b4bb tools/graph2dot: Check for av_malloc() failure 
Fixes CID1271047

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 22:51:13 +01:00
Michael Niedermayer
704c980294 avcodec/aacenc: Fix sample rate check 
Fixes out of array read
Fixes CID1257803, CID1257797, CID1257789, CID1257786

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 22:29:09 +01:00
Martin Storsjö
a388e72d1a rtpenc_hevc: Aggregate multiple NAL units into one RTP packet, if possible 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-22 23:27:03 +02:00
Martin Storsjö
e2220e734f rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-22 23:26:57 +02:00
Michael Niedermayer
a6baef6517 avcodec/mpegvideo: Fix memleak of mvs 
Fixes CID1271053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 22:18:26 +01:00
Thomas Volkert
c99915f7c7 rtpdec: DV depacketizer (RFC 6469) 
(tested with live555 RTSP server)

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-22 23:01:55 +02:00
Michael Niedermayer
2234a1cd16 avcodec/vorbisdec: Fix memleak, call cleanup on memory allocation failure 
Fixes CID1258478, CID1258476, CID1258475
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 21:27:09 +01:00
Michael Niedermayer
8559a71415 avcodec/wmaenc: Check extradata allocations 
Fixes CID1257842

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 21:23:39 +01:00
Christophe Gisquet
e0c7ba40cf takdec: pad filter coeff buffer for DSP functions 
Currently, a part of the loop has to be handled in plain C, because of DSP
function requirements of having batches of 16 elements to process.

Instead, pad the buffer with 0 where the DSP functions are overreading.

Signed-off-by: James Almer <jamrial@gmail.com>
 2015-02-22 16:35:32 -03:00
Michael Niedermayer
b7e7ee6231 avfilter/buffer: Check for qp_table allocation failure 
Fixes CID1271048
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 20:27:11 +01:00
Michael Niedermayer
3518925a91 avformat/movenc: Check for memory allocation failures 
Fixes CID1271049
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 20:20:13 +01:00
Michael Niedermayer
40adcf576f avformat/oggdec: Check for ost allocation failure 
Fixes CID1257798
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 19:21:53 +01:00
Paul B Mahol
586ba24ff2 avcodec/exr: fix memset first arg in reverse_lut() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-22 17:30:50 +00:00