ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-29 01:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,563 Commits 37 Branches 398 Tags 500 MiB
0c67ef2729
Commit Graph

62563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
e36aaeca3a avfilter/vf_colormatrix: fix memleak on error 
Fixes CID1197065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 01:25:00 +02:00
Michael Niedermayer
5027f39712 swresample/resample: use av_malloc_array() where appropriate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 00:29:26 +02:00
Michael Niedermayer
a5290cb1ac swresample/dither: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 00:29:20 +02:00
Michael Niedermayer
f9158b01d0 swresample/resample: Limit filter length 
Related to CID1197063

The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-08 00:25:49 +02:00
Carl Eugen Hoyos
7fcb4f6c51 Fix compilation with --disable-everything --enable-decoder=rawvideo. 2014-04-08 00:04:25 +02:00
Vittorio Giovara
92b099daf4 swscale: support converting YVYU422 pixel format 2014-04-07 23:50:34 +02:00
Vittorio Giovara
8b17243d17 lavu: Add packed YVYU422 pixel format 2014-04-07 23:50:34 +02:00
Vittorio Giovara
46439e1562 mp2: match twolame default options 2014-04-07 23:50:33 +02:00
Paul B Mahol
718907cd88 libtwolame MP2 encoding support 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-07 23:50:33 +02:00
Michael Niedermayer
0d225863f2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libxvid: fix missing end of line character

Conflicts:
	libavcodec/libxvid.c

No change as the buggy modification wasnt merged, ffmpeg handles the
case where both lumi and variance masking are set, differently

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 20:53:34 +02:00
Carl Eugen Hoyos
836b60ce2b Fix standalone compilation of vp7 and vp8 decoder. 
Fixes ticket #3536.
 2014-04-07 15:30:48 +02:00
Carl Eugen Hoyos
993a5afaad Read aspect ratio from tiff image files. 2014-04-07 15:30:48 +02:00
Vittorio Giovara
17a75a8c09 libxvid: fix missing end of line character 
Error introduced in 5ce7ca68b8.
 2014-04-07 14:56:25 +02:00
Schenk, Michael
845414bbb1 avformat/oggdec: reset nstreams in close 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 14:55:35 +02:00
Schenk, Michael
b0a8521383 avformat/mov: reset drefs_count in close 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 14:51:36 +02:00
Matt Oliver
158a80cc0b Remove leal op to fix icl inline asm. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 13:02:54 +02:00
Reynaldo H. Verdejo Pinochet
02497a5dc8 ffserver: don't hardcode RTSP status codes 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-07 00:24:00 -03:00
Reynaldo H. Verdejo Pinochet
5267a5d783 rtspcodes: add full list of RTSP status codes 
Also add reason phrases from http://www.ietf.org/rfc/rfc2326.txt
and macro to translate.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-07 00:24:00 -03:00
Reynaldo H. Verdejo Pinochet
0c5a6ef886 ffserver: nits & typos 
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-07 00:24:00 -03:00
Thilo Borgmann
fdaf8372c2 configure: Check for generated output in check_header_oc. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 05:11:47 +02:00
Michael Niedermayer
a75ba1e116 avcodec/h264/find_start_code: factorize addition out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 04:18:21 +02:00
Michael Niedermayer
13aa575764 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  xtea: Add Doxy @file and group

See: 50f52a5498
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 04:16:47 +02:00
Michael Niedermayer
a6fa3a476a Merge commit 'f73495686d109ffffaa8c0387e790e7997326229' 
* commit 'f73495686d109ffffaa8c0387e790e7997326229':
  adler32: Fix doxy group definition

See: 624672fcce and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 04:15:59 +02:00
Michael Niedermayer
0ecb3075c1 Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a' 
* commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a':
  h264: Refactor decode_nal_units

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 03:59:22 +02:00
Michael Niedermayer
a7a82f2f22 Merge commit 'c389a804943095ebf078daec6b64690d2c97069c' 
* commit 'c389a804943095ebf078daec6b64690d2c97069c':
  libxvid: Add SSIM displaying through a libxvidcore plugin

Conflicts:
	libavcodec/libxvid.c
	libavcodec/version.h

See: 3b3c1ed076
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 03:20:23 +02:00
Michael Niedermayer
072278c777 Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1' 
* commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1':
  libxvid: add working lumimasking and variance AQ

Conflicts:
	libavcodec/libxvid.c
	libavcodec/version.h

See: ccb212b6c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 03:08:25 +02:00
Michael Niedermayer
190106e884 Merge commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332' 
* commit 'd3789eeeed3423bd1ca9dc40030a2f7a21ea5332':
  aarch64: implement videodsp.prefetch

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 02:51:05 +02:00
Michael Niedermayer
4c57c6a765 Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 
* commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14':
  aarch64: add armv8 CPU flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 02:15:18 +02:00
Stephan Hilb
541bebd414 lavc/cpia: use avpriv_report_missing_feature() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 01:33:53 +02:00
Stephan Hilb
5dae3cf357 lavc/cpia: fix typo in log message 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 01:33:10 +02:00
Timothy Gu
486e3649ce xtea: Add Doxy @file and group 2014-04-07 01:31:36 +02:00
Timothy Gu
f73495686d adler32: Fix doxy group definition 
Based on a patch by James Almer <jamrial@gmail.com>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-07 01:31:02 +02:00
Michael Niedermayer
01a5d71789 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Set Matroska private data when muxing Prores.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 23:57:42 +02:00
Michael Niedermayer
9e7f1474dd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: add tests for SANM and VIMA

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/sanm

See: 4cdff58206
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 23:43:02 +02:00
Carl Eugen Hoyos
3d5c859fa6 Set Matroska private data when muxing Prores. 
The specification requires the mov code point to be written as "fourcc".
 2014-04-06 23:35:17 +02:00
Luca Barbato
e10fd08aa7 h264: Refactor decode_nal_units 2014-04-06 23:33:17 +02:00
Michael Niedermayer
5297003aa7 Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' 
* commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123':
  LucasArts SMUSH demuxer

Conflicts:
	Changelog
	doc/general.texi
	libavformat/smush.c
	libavformat/version.h

See: bef8fd7099
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 23:29:47 +02:00
Timothy Gu
c389a80494 libxvid: Add SSIM displaying through a libxvidcore plugin 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-06 23:23:13 +02:00
Timothy Gu
5ce7ca68b8 libxvid: add working lumimasking and variance AQ 
The old implementation is unusable due to changes in the Xvid API.
Further fixes by Michael Niedermayer <michaelni@gmx.at>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-06 23:23:13 +02:00
Michael Niedermayer
787be6d074 Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89' 
* commit '6f273093e54cba130f3ffde3d6433e74baa4ad89':
  LucasArts SMUSH VIMA audio decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavcodec/vima.c

This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
to the previously used name "vima"
These changes are needed for compatibility with the renamed codec in libav

See: b18357326c and others

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 23:14:23 +02:00
Michael Niedermayer
881f4e8d34 Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2' 
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
  LucasArts SMUSH SANM video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/sanm.c
	libavcodec/version.h

See: 69254f4628 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 22:19:16 +02:00
Reimar Döffinger
a0568ed254 rtspdec: check for strchr returning NULL. 
Fixes CID 732244.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-06 22:04:03 +02:00
Janne Grunau
d3789eeeed aarch64: implement videodsp.prefetch 
8% faster h264 decoding on Apple A7.
 2014-04-06 21:18:49 +02:00
Janne Grunau
8675bcb0ad aarch64: add armv8 CPU flag 2014-04-06 21:18:49 +02:00
Reimar Döffinger
57d10a28f4 pulseaudio: move NULL check up before dereference. 
Fixes CID 1197068.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-06 19:38:51 +02:00
Hendrik Leppkes
fc7e02f0ff dcadsp: fix SSE code to not use SSE2 instructions. 
movq from SSE register to memory is an SSE2 instruction.
Instead, use SSE movlps, which does the same thing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 18:31:22 +02:00
Michael Niedermayer
4ccd7cb45b avformat/oggdec/ogg_read_packet(): factorize failure code path 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 18:10:47 +02:00
Michael Niedermayer
c1b24ca762 avformat/oggdec: check for av_packet_new_side_data() failure 
Fixes CID1197062
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 18:10:47 +02:00
Michael Niedermayer
28f8114bd2 avcodec/vp8: fix checking vp7_feature_value_size 
Fixes CID1197061

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 18:10:47 +02:00
Vladlen Y. Koshelev
cdbd9e218d avformat/hls: support for seeking on event playlists 
This allows clients to seek between first played segment
and the last one in the live stream playlist with #EXT-X-PLAYLIST-TYPE:EVENT attribute.
 2014-04-06 17:55:04 +03:00