xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-23 19:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,327 Commits 31 Branches 338 Tags 298 MiB
bff2afb3e9
Commit Graph

44327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
bff2afb3e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: dsputil: Only compile motion_est code when encoders are enabled
  mem: fix typo in check for __ICC
  fate: mp3: drop redundant CMP setting
  rtp: Depacketization of JPEG (RFC 2435)
  Rename ff_put_string to avpriv_put_string
  mjpeg: Rename some symbols to avpriv_* instead of ff_*
  yadif: cosmetics

Conflicts:
	Changelog
	libavcodec/mjpegenc.c
	libavcodec/x86/Makefile
	libavfilter/vf_yadif.c
	libavformat/version.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-10 14:06:20 +02:00
Stefano Sabatini
e4fe4d01fc ffprobe: simplify default printer 
Remove pointless default_print_footer() and
default_print_chapter_header() callbacks, also avoid to print an
empty line when noprint_wrappers is selected.
 2012-09-10 10:22:36 +02:00
Diego Biurrun
a84edbacaf x86: dsputil: Only compile motion_est code when encoders are enabled 2012-09-10 08:31:47 +02:00
Mans Rullgard
8c5ed7a66a mem: fix typo in check for __ICC 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-10 00:07:26 +01:00
Mans Rullgard
f181662db9 fate: mp3: drop redundant CMP setting 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-10 00:07:24 +01:00
Reinhard Nissl
2474ca1a22 aacdec.c: fix some comments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 22:54:10 +02:00
Samuel Pitoiset
3c19815416 rtp: Depacketization of JPEG (RFC 2435) 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-09 22:22:21 +03:00
Martin Storsjö
aefea4d0de Rename ff_put_string to avpriv_put_string 
This allows using it from libavformat as well. This will be used
by the RTP/JPEG depacketizer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-09 22:22:12 +03:00
Samuel Pitoiset
a0845bae49 mjpeg: Rename some symbols to avpriv_* instead of ff_* 
These symbols will be used from the RTP/JPEG depacketizer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-09 22:22:07 +03:00
Derek Buitenhuis
16c03f2e91 file: Add S_ISFIFO compatability macro 
Not all systems have S_ISFIFO.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 20:23:14 +02:00
Michael Niedermayer
44f83930d9 x86/mpegaudiodec: fix compilation failure on cygwin with undefined imdct36_blocks_avx 
this is a regression since today

Found-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 18:39:03 +02:00
Derek Buitenhuis
3629d1c09d dsputil_template: Reindent after recent change 
Forgot to keep it pretty in e62e455f7b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 17:21:37 +02:00
Michael Niedermayer
6add8eb2ce x86/h264dsp_init: put a HAVE_YASM back 
Should fix compilation on open solaris

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 17:21:02 +02:00
Luca Barbato
28165fee1b yadif: cosmetics 2012-09-09 15:31:18 +02:00
Michael Niedermayer
17f9626b5d tiff/doubles2str: check for truncation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:41:18 +02:00
Michael Niedermayer
0196bc6f14 tiff/doubles2str: factor out component_len 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:40:10 +02:00
Michael Niedermayer
07108cafc6 gxfenc: assert that the to be written data has not been truncated. 
Otherwise out of array reads would happen later

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:31:44 +02:00
Michael Niedermayer
eb336cb881 gxfenc: dont duplicate buffer size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:31:06 +02:00
Michael Niedermayer
7992814920 ffprobe: avoid unsafe usage of the snprintf() return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:26:42 +02:00
Michael Niedermayer
b9a07e787b srtdec: fix unsafe snprintf() return usage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:19:02 +02:00
Michael Niedermayer
9fea619f19 ass: assert that the timsstamps fitted in the buffers 
Failure of the assert would cause various problems later
if we continue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:19:02 +02:00
Michael Niedermayer
d7cb5a8daf ffmpeg_filter: fix unsafe snprintf() usage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:11:03 +02:00
Michael Niedermayer
1fc3e8f4ea ffserver: fix unsafe snprintf() return usage. 
Found-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:10:11 +02:00
Michael Niedermayer
9c6af3a3db ffserver: increase buffer size in http_send_too_busy_reply() 
also add a assert0 to make sure the data is not truncated (which
should be impossible now)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 14:09:59 +02:00
Michael Niedermayer
77aedc77ab Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: Provide the right alignment for external mmx asm
  x86: Replace checks for CPU extensions and flags by convenience macros
  configure: msvc: fix/simplify setting of flags for hostcc
  x86: mlpdsp: mlp_filter_channel_x86 requires inline asm

Conflicts:
	libavcodec/x86/fft_init.c
	libavcodec/x86/h264_intrapred_init.c
	libavcodec/x86/h264dsp_init.c
	libavcodec/x86/mpegaudiodec.c
	libavcodec/x86/proresdsp_init.c
	libavutil/x86/float_dsp_init.c
	libswscale/utils.c
	libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 13:27:42 +02:00
Michael Niedermayer
4819d43d7f aacpsy: use exp2(f) instead of pow(f)(2,...) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 13:02:08 +02:00
Michael Niedermayer
b027156b19 ffprobe: use exp2 instead of pow(2, ...) 2012-09-09 13:02:08 +02:00
Michael Niedermayer
363d302ea3 imc: use exp2 instead of pow(2,...) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 13:02:08 +02:00
Stefano Sabatini
eab438eabb lavu/samplefmt: fix/clarify documentation for av_samples_fill_arrays() 
In particular, avoid improper use of the term "channels" in place of
"planes", and fix erroneous documentation for the linesize parameter.
 2012-09-09 11:41:17 +02:00
Stefano Sabatini
3634441452 lavu/samplefmt: add note regarding buf validity in av_samples_fill_arrays() doxy 2012-09-09 11:21:45 +02:00
Stefano Sabatini
a4cb0af945 lavfi: drop deprecated and pointless avfilter_default_end_frame() function 
Fix warning when compiling boxblur.

While this is technically a major API break, practically there will be no
one using that function since the filtering API is mostly private, so
that function alone is not usable.
 2012-09-09 10:57:28 +02:00
Derek Buitenhuis
e62e455f7b dsputil/me/pixels: Actually use av_restrict 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 03:55:56 +02:00
Michael Niedermayer
d48ebfbdea mpeg4videodec: Fix "warning: dc_pred_dir may be used uninitialized in this function" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 03:15:46 +02:00
Michael Niedermayer
59fdf543d5 smush: read subversion for version==1 too. 
This avoids a gcc warning, otherwise it should have no effect.
its a bit more consistent too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 02:36:57 +02:00
Michael Niedermayer
31a797eb28 swr: add av_cold to init/free functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 02:26:20 +02:00
Martin Storsjö
75c37c5ace swscale: Provide the right alignment for external mmx asm 
This reverts parts of e0c6cce447. There is external mmx asm that
requires this alignment.

This fixes crashes when using swscale in builds with external mmx,
without inline assembly.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-09 01:52:35 +03:00
Michael Niedermayer
dd081f98dd dct-test: fix order of evaluation bug 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 23:57:37 +02:00
Michael Niedermayer
d40c0e4a67 ffserver: fix order of evaluation bugs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 23:56:26 +02:00
Michael Niedermayer
0e78e575ed swr/auto_matrix: treat a single channel as mono instead of failing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:32:24 +02:00
Michael Niedermayer
f8d74cbdc3 swr/auto_matrix: treat stereo downmix like stereo. 
Based on code by John Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:12:40 +02:00
Michael Niedermayer
c8ffab06f4 swr/auto_matrix: add clean layout function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:10:19 +02:00
Michael Niedermayer
ebc854e4e9 swr/auto_matrix: move layouts to local variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 20:58:57 +02:00
Diego Biurrun
e0c6cce447 x86: Replace checks for CPU extensions and flags by convenience macros 
This separates code relying on inline from that relying on external
assembly and fixes instances where the coalesced check was incorrect.
 2012-09-08 18:18:34 +02:00
Derek Buitenhuis
9ab538e31f random_seed: Replace a VLA with a normal array 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 17:30:10 +02:00
Mans Rullgard
6a0200f24d configure: msvc: fix/simplify setting of flags for hostcc 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-08 15:09:13 +01:00
Hendrik Leppkes
fb4e983e0c x86: mlpdsp: mlp_filter_channel_x86 requires inline asm 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-08 15:41:44 +03:00
Michael Niedermayer
b86e18fe46 yuv4mpeg: fix potential alignment bug 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 13:37:35 +02:00
Michael Niedermayer
7beadfe1f7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mov_chan: Only set the channel_layout if setting it to a nonzero value
  mov_chan: Reindent an incorrectly indented line
  mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
  x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
  x86: more specific checks for availability of required assembly capabilities
  x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
  fate: Drop redundant setting of FUZZ to 1
  cavsdsp: set idct permutation independently of dsputil
  x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 12:53:44 +02:00
Michael Niedermayer
8a0118b4b4 ffio_read: dont spam the user at EOF with a truncation error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 12:41:57 +02:00
Daniel Verkamp
124f0b2f46 flashsv2enc: only encode diff blocks when needed 
A flashsv2 block may have a "diff block" to indicate which scan lines of
the block are actually encoded.  However, this diff block need not be
used when the entire block is coded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 05:36:34 +02:00