RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
66,204 Commits 36 Branches 398 Tags 242 MiB
Commit Graph

66204 Commits

Author SHA1 Message Date
Michael Niedermayer f0d4f00f24 avcodec/mjpegdec: fix green line at the bottom with upscale v 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-31 15:33:30 +02:00
Michael Niedermayer 63a52ca134 avcodec/mjpegdec: fix green vertical line at the right with upscale h 
Fixes Ticket3891

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-31 15:16:36 +02:00
Reimar Döffinger 6d7aa437e1 vf_drawtext: move "static const" before "struct". 
This is consistent with all other occurrences.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:41:42 +02:00
Reimar Döffinger 2ca7edda89 lavu/hash.c: Add missing "static const". 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:33:02 +02:00
Reimar Döffinger 03bf457241 Add av_cold to table generation functions. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:33:02 +02:00
Reimar Döffinger 4fe448738e WMA: add "const" to avoid warnings with hardcoded tables. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:31:09 +02:00
Reimar Döffinger 3bc5d2a064 ac3dec_fixed: add missing "static const". 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Reimar Döffinger c9a4ec7969 lavfi: add const/static const to pix_fmts arrays. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Reimar Döffinger 18464d7270 sipr16kdata.h: add forgotten const. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Reimar Döffinger 2bb66cc8be fft_template: Move variables to where they are used. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Reimar Döffinger 1654514ab0 fft: add ff_ prefix to some global arrays. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-31 10:25:36 +02:00
Michael Niedermayer e0237208b4 avcodec/h264: Do not get stuck on IDR inter frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-31 04:09:06 +02:00
Reimar Döffinger 8c63a0d171 xv.c: Add missing const to lookup table. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-30 18:02:45 +02:00
Paul B Mahol bd6f145820 avformat/dfa: use avio_feof() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-30 15:50:22 +00:00
wm4 b173f5c155 oggdec: fix invalid free on error 
The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 16:38:14 +02:00
Reimar Döffinger e2cd28c926 fft: add missing const. 
This table was the largest object in FFmpeg's .data,
and really should be in .rodata.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-30 16:33:00 +02:00
Michael Niedermayer ce36d80881 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
  ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 14:38:44 +02:00
Christophe Gisquet a808733675 proresenc_ks: allow auto-selecting profile 
The user may not know how to select the profile, nor what he needs, in
particular to encode alpha.

Therefore, use an automatic selection as default, and warn when the
manually selected profile may cause issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 14:16:26 +02:00
Michael Niedermayer 1402873601 avcodec/vp3data: use more compact data types 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 13:45:15 +02:00
Carl Eugen Hoyos f22c24bd7a lavf/rtpdec_hevc: Fix compilation with -DDEBUG. 2014-08-30 13:01:51 +02:00
Carl Eugen Hoyos 494cbc4238 ffmpeg: Clean up if filter initialisation failed to avoid a memleak. 
Fixes ticket #3858.

Reviewed-by: Nicolas George
 2014-08-30 13:01:51 +02:00
Michael Niedermayer e16b7338d8 avcodec/aarch64/h264qpel_init_aarch64: mark src as const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 12:48:31 +02:00
Michael Niedermayer 97cebf3139 avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 12:43:58 +02:00
Michael Niedermayer 19bf1ed1f4 avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is unavailable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 12:21:07 +02:00
Michael Niedermayer 0daff3ce76 avfilter/vf_mp: remove incorrect usage of AVFrame.type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 12:16:46 +02:00
Michael Niedermayer 596636a474 avcodec/snow: check coeffs for validity 
Fixes deadlock
Fixes integer overflow
Fixes Ticket 3892

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 02:12:10 +02:00
Reimar Döffinger d9e2aceb7f Add missing "const" all over the place. 
Only "./configure --enable-gpl" on x86 was tested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-29 18:57:25 +02:00
Reimar Döffinger be4aac302b patcheck: check for pointer arrays that are not const. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-29 18:57:25 +02:00
Peter Ross 9b8eedd736 avformat/wtvdec: seek over broken chunks 
Fixes ticket #3898

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 14:00:58 +02:00
Michael Niedermayer 72732f2ddd avformat/webmdashenc: use av_strlcpy() and allocate enough space 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 13:02:34 +02:00
Michael Niedermayer 5ce98e774e fate/vpx: make webm dash manifest tests depend on the WEBM_DASH_MANIFEST demuxer 
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 12:39:59 +02:00
Paul B Mahol be3d8073ed avcodec/wavpack: increase WV_MAX_SAMPLES 
This is maximal number of samples per frame that current wavpack
can create.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-08-29 10:37:49 +00:00
Vignesh Venkatasubramanian 4c9204783a fate: Add basic tests for WebM Dash Manifest 
Add fate tests that test out the functionality of WebM DASH
Manifest XML generation. This patch contains the vpx.mak file
changes and the reference gold XML files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 04:25:29 +02:00
Michael Niedermayer 22652dc2b8 avcodec/avcodec: fix missing doxygen comment marker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 01:31:10 +02:00
Michael Niedermayer 37520a91ac avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 01:26:52 +02:00
Michael Niedermayer 7771daaea7 Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5' 
* commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5':
  license: Mention that vf_interlace is GPL, not LGPL

Conflicts:
	LICENSE.md

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 01:08:57 +02:00
Michael Niedermayer 39cd9fdbf8 Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7' 
* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
  matroskaenc: convert avstream stereo3d side data during encoding

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-29 00:44:47 +02:00
Michael Niedermayer fcc3909908 Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f' 
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
  matroskadec: parse stereo mode on decoding

Conflicts:
	Changelog
	libavformat/matroska.c
	libavformat/matroskadec.c

See: 4c509fe305 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 23:48:23 +02:00
Michael Niedermayer 31f9c228c0 ffmpeg: Fix missing {} in Stream to Packet side data code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 23:34:20 +02:00
Michael Niedermayer f30a8154ab Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5' 
* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
  avcodec: add stream-level stereo3d side data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 22:23:01 +02:00
Michael Niedermayer 56cc754c76 Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef' 
* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
  matroska: list supported extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 22:12:36 +02:00
Michael Niedermayer c6a3b00924 Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05' 
* commit '58396e806c65fe0eb00e6ccf1980f810cdceed05':
  x11grab: Use a typedef for the context, as most other code does

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 22:06:48 +02:00
Michael Niedermayer 1fc3963188 Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea' 
* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
  x11grab: Drop a spurious space in the extension reporting message

Conflicts:
	libavdevice/x11grab.c

See: 9af2097120
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 21:51:34 +02:00
Michael Niedermayer 65c9e2d003 Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198' 
* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
  x11grab: Small near-cosmetic refactorings

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 21:39:19 +02:00
Michael Niedermayer 5393c9dadd Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8' 
* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
  x11grab: K&R formatting cosmetics

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 21:21:47 +02:00
Diego Biurrun 9e8bbe7d4d license: Mention that vf_interlace is GPL, not LGPL 2014-08-28 19:47:43 +02:00
Vittorio Giovara 4d686fb721 matroskaenc: convert avstream stereo3d side data during encoding 
Write the StereoMode Embl to bitstream.
 2014-08-28 12:35:27 -04:00
Vittorio Giovara d4ae8ac92f matroskadec: parse stereo mode on decoding 
Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.

Bump the doctype version supported.

Bug-Id: 728 / https://bugs.debian.org/757185
 2014-08-28 12:33:26 -04:00
Vittorio Giovara 9301486408 avcodec: add stream-level stereo3d side data 2014-08-28 12:33:26 -04:00
Vittorio Giovara f2583bc86e matroska: list supported extensions 2014-08-28 12:33:25 -04:00