ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 23:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,967 Commits 37 Branches 398 Tags 539 MiB
c0170d0973
Commit Graph

29967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
c0170d0973 imgutils: introduce internal image_get_linesize() and use it 
Allow to factorize code between av_image_get_linesize() and
av_image_fill_linesizes(), and add missing checks.

Increase robustness.
 2011-05-16 23:55:54 +02:00
Stefano Sabatini
0d73227c71 imgutils: make av_image_get_linesize() return AVERROR(EINVAL) for invalid pixel formats 2011-05-16 23:55:47 +02:00
Stefano Sabatini
d8c7a21602 drawtext: specify union type for setting default options 
Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’)
 2011-05-16 23:50:43 +02:00
Stefano Sabatini
e8ea9c2179 drawtext: reindent after the previous commit 2011-05-16 23:50:36 +02:00
Stefano Sabatini
ce207e050e drawtext: fix strftime() text expansion 
The feature was dropped after the filter was partially rewritten and
recommitted.

Fix issue #207.
 2011-05-16 23:50:29 +02:00
Michael Niedermayer
9763420bcc rawdec: Allow overriding top field first. 
Iam not sure this is the best way to implement it, but its the simplest
and keeps the code seperate from the application. Keeping ffmpeg.c
simple and not requireing user apps to duplicate this code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-16 21:52:35 +02:00
Michael Niedermayer
198783744e ffmpeg: initialize input_codec array earlier. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-16 21:26:18 +02:00
Michael Niedermayer
5319f48a57 cmdutils: Allocate private decoder context if its not allocated yet. 
This fixes and simplifies setting decoder private options.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-16 21:26:18 +02:00
Stefano Sabatini
68bed67d2e pngdec: relax condition for setting monoblack pixel format 
Ignore color_type information for setting the monoblack pixel format,
only rely on bit_depth.

In particular: fix Test_1bpp_grayscale.png from issue #172.

This may work fine for some broken encoder, and not for others.
 2011-05-16 16:34:47 +02:00
ami_stuff
85eedcf6ff Support decoding of 1bpp rawvideo in avi (ticket 205). 2011-05-16 11:26:45 +02:00
ami_stuff
0eba7fc293 Support decoding of 2bpp rawvideo in avi (ticket 206). 2011-05-16 11:25:57 +02:00
Carl Eugen Hoyos
d43a6edf7d Bump minor after adding a caf muxer. 2011-05-16 11:24:23 +02:00
Michael Niedermayer
fc193793c6 Merge remote branch 'qatar/master' 
* qatar/master:
  aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.
  acelp: Remove unused gray_decode table.
  dfa: Remove unused variable.
  configure: Include AVX availability in summary output.
  configure: use same CPPFLAGS in kFreeBSD as Linux

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-16 05:01:40 +02:00
Hanspeter Niederstrasser
350f3d145b configure: another try on fixing osx/mingw SDL 2011-05-16 02:57:15 +02:00
Justin Ruggles
033a4a942a aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding. 2011-05-15 17:42:05 -04:00
Michael Niedermayer
a80f74c584 av_picture_crop(): Support simple cases with packed pixels too. 
This fixes a regression when linked to old ffmpeg.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-15 22:37:02 +02:00
Diego Biurrun
7f995abed3 acelp: Remove unused gray_decode table. 2011-05-15 19:01:06 +02:00
Diego Biurrun
b1bb3b8d87 dfa: Remove unused variable. 
This fixes the warning:
libavcodec/dfa.c:189: warning: unused variable ‘frame_end’
 2011-05-15 13:12:47 +02:00
Diego Biurrun
c73b779d35 configure: Include AVX availability in summary output. 2011-05-15 13:11:01 +02:00
Stefano Sabatini
27614b1217 rawdec: propagate pict_type information to the output frame 2011-05-15 12:29:16 +02:00
Stefano Sabatini
a05d02079e showinfo: replace "CRC" by "checksum" 
Indeed the Adler-32 checksum, which is computed by showinfo, is not
cyclic, so using the term "CRC" is wrong/confusing.
 2011-05-15 12:28:53 +02:00
Stefano Sabatini
5a2ea3cffb showinfo: fix vertical align nit 2011-05-15 12:27:28 +02:00
Stefano Sabatini
bb82ea797f showinfo: fix computation of Adler checksum 
Previously the code was computing the checksum only for the first line
of each plane.
 2011-05-15 12:27:28 +02:00
Stefano Sabatini
10931720cd imgutils: generalize linesize computation for bitstream formats 
Make it a subcase of the general algorithm used for the non-bitstream
case. Simplify, and make av_image_get_linesize() and
av_image_fill_linesizes() correctly return the right value when plane
!= 0.

In particular fix a crash occurring with:
-vf format=monow,showinfo,format=monow.
 2011-05-15 12:27:07 +02:00
Reinhard Tartler
c1f5447805 configure: use same CPPFLAGS in kFreeBSD as Linux 
046f081b46 reorganized the CPPFLAGS to no
longer add -D_POSIX_C_SOURCE unconditionally, but only on systems (e.g.,
glibc based ones) that require it.  As kFreeBSD uses glibc, it needs to
be treated similar.

Additionally, _BSD_SOURCE is turned on to enable some additional types
such as caddr_t, which are normally enabled on BSD but not with glibc.
 2011-05-15 10:33:52 +02:00
Michael Niedermayer
5a153604c9 Merge remote branch 'qatar/master' 
* qatar/master:
  Fix FSF address copy paste error in some license headers.
  Add an aac sample which uses LTP to fate-aac.
DUPLICATE  [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
  arm: properly mark external symbol call

Conflicts:
	libavcodec/x86/ac3dsp.asm
	libavcodec/x86/deinterlace.asm
	libavcodec/x86/dsputil_yasm.asm
	libavcodec/x86/dsputilenc_yasm.asm
	libavcodec/x86/fft_mmx.asm
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/h264_chromamc.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264_idct.asm
	libavcodec/x86/h264_intrapred.asm
	libavcodec/x86/h264_weight.asm
	libavcodec/x86/vc1dsp_yasm.asm
	libavcodec/x86/vp3dsp.asm
	libavcodec/x86/vp56dsp.asm
	libavcodec/x86/vp8dsp.asm
	libavcodec/x86/x86util.asm
	libswscale/ppc/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-15 04:44:07 +02:00
Carl Eugen Hoyos
2c4ad1a37b Initial caf muxer. 2011-05-15 03:25:57 +02:00
Carl Eugen Hoyos
0c3803f6bb Support decoding of amr_nb and gsm in caf. 2011-05-15 03:25:57 +02:00
Carl Eugen Hoyos
445ee35e21 Fix decoding of msrle samples with 1bpp. 2011-05-15 03:25:57 +02:00
Michael Niedermayer
7b915726eb udp: remove resource.h inclusion, it breaks mingw compilation. 
The header seems unneeded, if its needed we will put it back with appropriate #if
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-15 01:48:17 +02:00
Michael Niedermayer
90bb2c78d6 ffmpeg: Allow seting and cycling through debug modes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-15 01:39:04 +02:00
Diego Biurrun
888fa31eca Fix FSF address copy paste error in some license headers. 2011-05-14 21:32:31 +02:00
Justin Ruggles
08e434b015 Add an aac sample which uses LTP to fate-aac. 2011-05-14 12:41:11 -04:00
Michael Niedermayer
34e838083e ffmpeg: Help for interactive keys. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-14 15:52:40 +02:00
Michael Niedermayer
e60e54ceb5 UDP: dont use thread_t as truth value. 
Unbreak compile on mingw.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-14 13:34:08 +02:00
Peter Belkner
502e858fd2 swscale: fix compile on mingw32 
Compiling "swscale.c" breaks on MINGW32 because of multiple including
"libswscale_template.c"
 2011-05-14 13:22:46 +02:00
Ronald S. Bultje
76f8a96e00 [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats. 
Also remove code that overwrites the C versions of functions in
sws_init_swScale_altivec(), so that it uses the C functions of files
if no altivec-optimized version exists.
 2011-05-14 06:37:39 -04:00
Martin Aumüller
b1eb7a1204 arm: properly mark external symbol call 
Surround memset and ff_vp8_dct_cat_prob by X() in order to fix iOS build

Includes patch by Luca Barbato <lu_zero@gentoo.org>.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-05-14 10:38:23 +02:00
Michael Niedermayer
0f6a8579af ffmpeg: Interactivity support. Try pressing +-hs. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-14 02:54:28 +02:00
Ronald S. Bultje
b025431bfe swscale: 10l forgot git add this change from ronald. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-14 02:50:10 +02:00
Michael Niedermayer
58c03f6d7d Merge remote branch 'qatar/master' 
* qatar/master:
  swscale: properly inline bits/endianness in yuv2yuvX16inC().
(We didnt pull the bug)  swscale: fix clipping of 9/10bit YUV420P.
  Add av_clip_uintp2() function
(our patch / duplicate)  dfa: fix buffer overflow checks to avoid integer overflows.
(our patch / duplicate)  movenc: always write esds descriptor length using 4 bytes.
(our patch / duplicate)  ffmpeg: use parse_number_and_die() when it makes sense
(No thanks)  ffmpeg: get rid of the 'q' key schizofrenia

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-14 02:19:58 +02:00
Michael Niedermayer
01d3ebaf21 AVFrame: only set parameters from AVCodecContext in decode_video*() when no frame reordering is used. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-14 00:16:49 +02:00
Michael Niedermayer
a3bc7a9ebf avcodec_default_get_buffer: init picture parameters. 
Fixes multithreading regression introduced in 64c06615d2
Fixes ticket197
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-14 00:16:49 +02:00
Ronald S. Bultje
9f54e461fe swscale: properly inline bits/endianness in yuv2yuvX16inC(). 2011-05-13 16:46:24 -04:00
Ronald S. Bultje
c3d68ec9c5 swscale: fix clipping of 9/10bit YUV420P. 2011-05-13 16:45:28 -04:00
Mans Rullgard
1550f45a89 Add av_clip_uintp2() function 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-13 16:45:24 -04:00
ami_stuff
2bd12ee3c8 Support more QT 1bpp rawvideo files. 
Fixes ticket #189.
 2011-05-13 18:11:19 +02:00
Michael Niedermayer
29ef0174cc UDP: udp depends on pthreads now 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-13 17:49:00 +02:00
Michael Niedermayer
03f8f39769 udp: switch custom fifo to libavutil fifo. 
This also allows us to drop the semaphore as our fifo is lock free.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-13 17:43:17 +02:00
Michael Niedermayer
593bb98d61 udp: use FFMAX&FFMIN. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-13 17:42:19 +02:00