RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 05:24:42 +00:00
Code Issues Projects Releases Wiki Activity
30,612 Commits 37 Branches 400 Tags 241 MiB
21bf6d7aab
Commit Graph

30612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
21bf6d7aab mpegvideo: use av_get_picture_type_char() in ff_print_debug_info() 2011-06-08 01:30:52 +02:00
Michael Niedermayer
1929807bef libvpxenc: add forgotten AVClass. 
Fixes Ticket269

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-07 18:22:53 +02:00
Stefano Sabatini
3251af9037 v4l2: set default standard to NULL 
It was errouneously changed to "NTSC" by the recent merge commit.
 2011-06-07 13:37:55 +02:00
Michael Niedermayer
7a8228c05e sws: make dither_scale const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-07 13:23:04 +02:00
Stefano Sabatini
4ae28eb853 showfiltfmts: use av_get_pix_fmt_name() 
Use av_get_pix_fmt_name() rather than access
av_pix_fmt_descriptors. Improve readability.
 2011-06-07 12:44:51 +02:00
Michael Niedermayer
40da61eff5 Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-07 04:43:03 +02:00
Michael Niedermayer
174df6affc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: remove empty $(OBJS) target
  build: make rule for linking ff* apply only to these targets
  build: rearrange some lines in a more logical way
  s302m: fix resampling for 16 and 24bits.
  ARM: remove MUL64 and MAC64 inline asm
  build: clean up .PHONY lists
  build: move all (un)install* target aliases to toplevel Makefile
  flvenc: propagate error properly
  build: remove stale dependency
  build: do not add CFLAGS-yes to CFLAGS
  utils.c: fix crash with threading enabled.
  configure: simplify source_path setup
  configure: remove --source-path option
  lavf: deprecate AVFormatParameters.time_base.
  img2: add framerate private option.
  img2: add video_size private option.
  img2: add pixel_format private option.
  tty: add framerate private option.

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-07 03:37:57 +02:00
Michael Niedermayer
3a1aaf7b21 ffplay: Fix -vismv 
Fixes Ticket164

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-07 03:17:42 +02:00
Michael Niedermayer
a39bd458a0 mem: Trying to workaround posix_memalign() bug on OSX 
This patch is based on a patch by John Stebbins

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-07 03:17:42 +02:00
Mans Rullgard
b9c6c7cb25 build: remove empty $(OBJS) target 
This target was added to prevent some files being deleted
by make when using chains of implicit rules.  This is no
longer required.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-07 01:28:40 +01:00
Mans Rullgard
6d170962bd build: make rule for linking ff* apply only to these targets 
This ensures that the special link command using cmdutils.o
only applies to the targets it should.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-07 01:28:15 +01:00
Stefano Sabatini
d58ed64a89 eval: add support for pow() function 
It is a more search-friendly alternative to the ^ operator.
 2011-06-07 00:37:00 +02:00
Mans Rullgard
d93d7349ce build: rearrange some lines in a more logical way 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-06 23:21:12 +01:00
Baptiste Coudurier
4f8da7e7dc s302m: fix resampling for 16 and 24bits. 2011-06-06 12:17:19 -07:00
Mans Rullgard
21c6512542 ARM: remove MUL64 and MAC64 inline asm 
Current GCC versions know how to generate these instructions
properly and avoiding inline asm gives better code.  The MULH
function for ARMv5 uses the same instruction and is also not
needed any more.

The MLS64 macro remains since negating an input would normally
not be allowed as it would fail for INT_MIN.  In our uses, the
inputs never have this value and thus negating is safe.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-06 17:33:40 +01:00
Mans Rullgard
0018b7f043 build: clean up .PHONY lists 
This removes nonexisting targets from phony lists and puts them
all in one place.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-06 16:56:53 +01:00
Mans Rullgard
d7a72d250b build: move all (un)install* target aliases to toplevel Makefile 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-06 16:56:53 +01:00
Luca Barbato
0e28e9ca8f flvenc: propagate error properly 
avio_flush can fail, in particular when used with the rtmp/librtmp
protocol.
 2011-06-06 10:53:19 -05:00
Mans Rullgard
171ae1eb0d build: remove stale dependency 
This dependency is implicitly covered elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-06 15:52:23 +01:00
Mans Rullgard
5eaba041a0 build: do not add CFLAGS-yes to CFLAGS 
CFLAGS-yes is never set so this serves no purpose.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-06 15:48:44 +01:00
Ronald S. Bultje
ceff045dbe utils.c: fix crash with threading enabled. 2011-06-06 10:31:01 -04:00
Mans Rullgard
8477f2deef configure: simplify source_path setup 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-06 15:16:23 +01:00
Mans Rullgard
dc435c4e9d configure: remove --source-path option 
This option does not work, and the implied functionality is
at best pointless.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-06 15:16:15 +01:00
Stefano Sabatini
263f57c6d7 pixdesc: remove duplicated header inclusion 2011-06-06 11:34:45 +02:00
Stefano Sabatini
ef28c7b3a4 lavfi: use av_samples_alloc() in avfilter_default_get_audio_buffer() 2011-06-06 10:14:08 +02:00
Stefano Sabatini
95a0242642 lavfi: prefer nb_samples over size in AVFilterBufferRefAudioProps 
Remove AVFilterBufferRefAudioProps.size, and use nb_samples in
avfilter_get_audio_buffer() and avfilter_default_get_audio_buffer() in
place of size.

This is required as the size in the audio buffer may be aligned, so it
may not contain a well defined number of samples.
 2011-06-06 10:12:49 +02:00
Stefano Sabatini
0bc2cca12f samplefmt: switch nb_channels/nb_samples params order in av_samples_alloc() 
This is consistent with the order of parameters in
av_samples_fill_arrays().
 2011-06-06 10:12:46 +02:00
Stefano Sabatini
e1c7414812 samplefmt: change layout for arrays created by av_samples_alloc() and _fill_arrays() 
The new layout is consistent with that of the av_image_() API, and
simplifies understanding and copy operations, it also preserves
alignment information which was lost with the previous layout.

This breaks API/ABI, but since the function was never referenced in
the code (and it isn't unlikely already used by someone) then this
should not be a problem.
 2011-06-06 10:11:48 +02:00
Anton Khirnov
b2592ea42c lavf: deprecate AVFormatParameters.time_base. 2011-06-06 06:46:10 +02:00
Anton Khirnov
abcedfac60 img2: add framerate private option. 2011-06-06 06:46:10 +02:00
Anton Khirnov
a915bf64cc img2: add video_size private option. 2011-06-06 06:46:10 +02:00
Anton Khirnov
f33e2a51d9 img2: add pixel_format private option. 2011-06-06 06:46:05 +02:00
Anton Khirnov
c1dcbfddf9 tty: add framerate private option. 2011-06-06 06:32:40 +02:00
Michael Niedermayer
580817df04 Move code for "ffmpeg: fix massive leak occurring when seeking" / e4841a404b elsewhere 
The picture struct is written to in the loop, so this cannot work.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-06 04:20:43 +02:00
Michael Niedermayer
f9569249c2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Remove some unused scripts from tools/.
  Add x86 assembly for some 10-bit H.264 intra predict functions.
  v4l2: do not force NTSC as standard
  Skip tableprint.h during 'make checkheaders'.
  Remove unnecessary LIBAVFORMAT_BUILD #ifdef.
  Drop explicit filenames from @file Doxygen tags.
  Skip generated table headers during 'make checkheaders'.
  lavf,lavc: free avoptions in a generic way.
  AVOptions: add av_opt_free convenience function.
  tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS.
  tiff: print log in case of unknown / unsupported tag.
  tiff: fix linesize for mono-white/black formats.
  Fix build of eval-test program
  configure: Document --enable-vaapi
  ac3enc: extract all exponents for the frame at once

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-06 03:33:58 +02:00
Stefano Sabatini
6700aa8810 lavf: remove reference to output-example in Makefile 
output-example.c (and renamed to muxing-example.c) has been moved to
doc/examples.
 2011-06-06 01:51:39 +02:00
Stefano Sabatini
27bcf55f45 vsrc_buffer: add flags param to av_vsrc_buffer_add_video_buffer_ref 
The new flags parameter allows to specify if the video ref to add
should overwrite the cache, if the flag is not set vsrc_buffer will
complain and abort; otherwise it will clean the already cached video
ref before to overwrite it, thus avoiding a leak.
 2011-06-06 01:35:27 +02:00
Diego Biurrun
eb7505e429 Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00
Daniel Kang
a8d44f9dd5 Add x86 assembly for some 10-bit H.264 intra predict functions. 
Parts are inspired from the 8-bit H.264 predict code in Libav.
Other parts ported from x264 with relicensing permission from author.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-06 01:31:02 +02:00
Luca Barbato
2c6fb9f032 v4l2: do not force NTSC as standard 
Setting a standard is meaningful only for analog capture devices.
 2011-06-05 14:20:56 -05:00
Reimar Döffinger
612d0782fc Add const to avfilter_get_video_buffer_ref_from_arrays arguments. 
Avoids warning about discarding qualifiers in avcodec.c

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-06-05 19:57:14 +02:00
Diego Biurrun
ef5d7e18f4 Skip tableprint.h during 'make checkheaders'. 
It is only used on the host and may not compile on the target.
 2011-06-05 16:01:01 +02:00
Diego Biurrun
fb8648ad4b Remove unnecessary LIBAVFORMAT_BUILD #ifdef. 2011-06-05 16:01:01 +02:00
Diego Biurrun
f25a2ece76 Drop explicit filenames from @file Doxygen tags. 
The filename is unnecessary and brittle across file renames.
 2011-06-05 16:01:00 +02:00
Diego Biurrun
29b3de127f Skip generated table headers during 'make checkheaders'. 2011-06-05 16:01:00 +02:00
Anton Khirnov
367732832f lavf,lavc: free avoptions in a generic way. 
It's simpler and less error-prone.

Fixes some memleaks along the way.
 2011-06-05 15:01:36 +02:00
Anton Khirnov
b39b06233d AVOptions: add av_opt_free convenience function. 2011-06-05 15:01:36 +02:00
Stefano Sabatini
e844abc498 sdl: align option fields after last commit 2011-06-05 13:55:02 +02:00
Stefano Sabatini
e4841a404b ffmpeg: fix massive leak occurring when seeking 
Avoid to add frames to the vsrc_buffer in the case ist->pts <
start_time, as these frames are unused (and never released). In
particular this condition is verified with commands of the kind:
ffmpeg -i INPUT -ss TIME OUTPUT

Also allow a minor simplification.
 2011-06-05 13:32:33 +02:00
Stefano Sabatini
cea87fb2c3 ffprobe: implement -i FILE option 
Useful for mimicking the ffmpeg -i FILE syntax.
 2011-06-05 13:31:47 +02:00