x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-07-03 01:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,099 Commits 40 Branches 429 Tags
605f89ffc9dfd278d241d0425e9a8d93d535bbdd
Commit Graph
1006 Commits
Author SHA1 Message Date
Michael Niedermayer 8af11e51f2 vf_scale: apply the same transform to the aspect during init that is applied per frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c8868f28e3)
 2011-09-07 14:20:53 +02:00
Michael NiedermayerandCarl Eugen Hoyos f20f79307b libavfilter: fix --enable-small 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 633aa01f72)
 2011-08-15 19:49:17 +02:00
Michael Niedermayer 095946afa7 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7: (65 commits)
  riff: Add mpgv MPEG-2 fourcc
  Update Changelog
  matroskadec: fix integer underflow if header length < probe length.
  ffmpeg: fix operation with --disable-avfilter
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  build: Create mlib optimization directories during out-of-tree builds.
  changelog: misc typo and wording fixes (cherry picked from commit b047941d7d)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963)
  matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
  Update RELEASE file
  update Changelog
  mt: proper locking around release_buffer calls.
  vp8/mt: flush worker thread, not application thread context, on seek.
  docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
  docs: Use proper markup for a literal command line option
  docs: Don't recommend adding --enable-memalign-hack
  docs: Remove needless configure options
  oggdec: prevent heap corruption.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  ...

Conflicts:
	Changelog
	configure
	doc/developer.texi
	libavcodec/libvpxenc.c
	libavcodec/rawdec.c
	libavfilter/x86/gradfun.c
	libavformat/Makefile
	libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-26 00:14:04 +02:00
Stefano SabatiniandDiego Biurrun 0b4840af0c vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h 
cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 9bc8bcddbd)
 2011-07-18 12:37:22 +02:00
Loren MerrittandDiego Biurrun 2f0a10174e vf_gradfun: relicense x86 asm to LGPL 
Actually I gave permission for LGPL long ago, but the original import
failed to update the license header.
(cherry picked from commit 082768f0b1)
 2011-07-07 16:51:47 +02:00
Clément BœschandMichael Niedermayer 680e473643 vf_mp: do not add duplicated pixel formats. 
This avoid a crash with in avfilter_merge_formats() in case one of the
filter formats list has multiple time the same entry.

Thanks to Mina Nagy Zaki for helping figuring out the issue.
 2011-06-22 20:21:54 +02:00
Michael Niedermayer 90c6963dae avfilter picture pool: double free hotfix 
This fix introduces a small memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 04:24:03 +02:00
Stefano SabatiniandAnton Khirnov 5a0a6ae639 ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX 
Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-20 20:54:40 +02:00
Stefano SabatiniandAnton Khirnov 702a62a1c6 drawtext: add braces around initialisers for option defaults 
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’)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-20 20:54:40 +02:00
Stefano SabatiniandAnton Khirnov 53a715f576 drawtext: reindent after the previous commit 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-20 20:54:40 +02:00
Stefano SabatiniandAnton Khirnov 3fd53defaa drawtext: fix strftime() text expansion 
The feature was dropped after the filter was partially rewritten and
recommitted.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-06-20 20:54:40 +02:00
Mina Nagy ZakiandStefano Sabatini fd2c0a5db2 lavfi: add layout negotiation fields and helper functions. 2011-06-19 22:58:32 +02:00
Mina Nagy ZakiandStefano Sabatini 527ca3985c lavfi: use int64_t lists in AVFilteFormats 
The list type was changed to int64_t to be able to hold
channel layouts.

avfilter_make_format_list() still takes a int32_t array and converts
it to int64_t. A new function, avfilter_make_format64_list, that
takes int64_t arrays has been added.
 2011-06-19 22:58:31 +02:00
Stefano Sabatini 8f349b6481 lavfi: fix realloc size computation in avfilter_add_format() 
Replace sizeof((*avff)->formats)
with    sizeof(*(*avff)->formats)

as the size of the array element is given by the pointed element
rather than by its pointer.

In particular fix computation with the pending patch when
sizeof(int64_t) != sizeof(int64_t *).
 2011-06-19 22:58:31 +02:00
Stefano Sabatini c6e288a7cd lavfi: fix Makefile HEADERS 
Add a missing space between vsink_buffer.h and vsrc_buffer.h.
1000l.
 2011-06-19 22:58:31 +02:00
Stefano Sabatini 44f669e7bc lavfi: add vsink_buffer, and use it in ff* tools 
Also add the public interface libavfilter/vsink_buffer.h.
 2011-06-19 19:18:33 +02:00
Stefano Sabatini e89ba76a59 vsrc_color: use internal timebase 
Avoid timescale conversion, simplify.
 2011-06-19 19:13:19 +02:00
Stefano Sabatini 15f03725ce lavfi: add negate filter 
This filter is a simple wrapper around the LUT filter.
 2011-06-19 19:06:55 +02:00
Stefano Sabatini dd2793c880 lavfi: add LUT (LookUp Table) generic filters 2011-06-19 19:06:35 +02:00
Michael Niedermayer 2905e3ff64 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: add opt_find to AVCodecContext class.
  h264: Complexify frame num gap shortening code
  intreadwrite.h: fix AV_RL32/AV_RB32 signedness.
  Fix decoding of mpegts streams with h264 video that does *NOT* have b frames
  Add minor bumps and APIChanges entries for lavf private options.
  ffmpeg: deprecate -vc and -tvstd
  ffmpeg: use new avformat_open_* API.
  ffserver: use new avformat_open_* API.
  ffprobe: use new avformat_open_* API.
  ffplay: use new avformat_open_* API.
  cmdutils: add opt_default2().
  dict: add AV_DICT_APPEND flag.
  lavf: add avformat_write_header() as a replacement for av_write_header().
  Deprecate av_open_input_* and remove their uses.
  lavf: add avformat_open_input() as a replacement for av_open_input_*
  AVOptions: add av_opt_find() as a replacement for av_find_opt.
  AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context.
  ffmpeg: don't abuse a global for passing frame size from input to output
  ffmpeg: don't abuse a global for passing pixel format from input to output
  ffmpeg: initialise encoders earlier.

Conflicts:
	cmdutils.c
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	ffprobe.c
	libavcodec/h264.c
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-18 05:10:38 +02:00
Stefano Sabatini 0c6cf3fa7c vsrc_color: set output pos values to -1 
-1 is more correct than 0, as the position in the file is undefined.
 2011-06-18 02:09:07 +02:00
Stefano Sabatini bb3a2b723a vsrc_color: add @file doxy 
Also remove outdated reference to color in vf_pad.c.
 2011-06-18 02:09:07 +02:00
Stefano Sabatini 8055433b49 graphparser: add missing NULL check in avfilter_graph_parse() 
Fix a crash occurring when open_inputs is NULL and *open_inputs is
checked, the crash was introduced by the recent avfilter_graph_parse()
syntax change.

In particular, fix graph2dot crash.
 2011-06-18 02:08:38 +02:00
Anton Khirnov 603b8bc2a1 Deprecate av_open_input_* and remove their uses. 
Deprecate the last remaining member of AVFormatParameters.
 2011-06-16 20:24:56 +02:00
Michael Niedermayer 9e2f448d68 vf_mp: Fix large memleak. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-15 01:36:12 +02:00
Stefano Sabatini 3fe6bbd5dc libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
Stefano Sabatini c535494268 avfiltergraph: make the AVFilterInOut alloc/free API public 
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.
 2011-06-12 22:46:02 +02:00
Stefano Sabatini 6119b23a36 avfiltergraph: change the syntax of avfilter_graph_parse() 
Make it returns the list of open inputs and outputs, so it can be
reused by applications.

Breaks API/ABI.
 2011-06-12 22:46:02 +02:00
Stefano Sabatini 86909dd5f7 graphparser: prefer void * over AVClass * for log contexts 2011-06-12 22:46:02 +02:00
Stefano Sabatini d468ed0321 lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config() 
Require "void *" rather than "AVClass *" for the log context type.
 2011-06-11 12:23:03 +02:00
Stefano Sabatini f5901fd392 avfiltergraph: use meaningful error codes 2011-06-11 11:55:54 +02:00
Mina Nagy ZakiandStefano Sabatini 79a0ec1af4 lavfi: avfilter_merge_formats: handle case where inputs are same 
This fixes a double-free crash if lists are the same due to the two
merge_ref() calls at the end of the (useless) merging that happens.
 2011-06-10 13:04:47 +02:00
Stefano Sabatini 989184fea4 lavfi: use avfilter_get_audio_buffer_ref_from_arrays() in defaults.c 
Use avfilter_get_audio_buffer_ref_from_arrays() in
avfilter_default_get_audio_buffer(), simplify.
 2011-06-10 13:02:13 +02:00
Stefano Sabatini c3819600e2 lavfi: implement avfilter_get_audio_buffer_ref_from_arrays() 2011-06-10 12:47:33 +02:00
Mina Nagy ZakiandStefano Sabatini 47d2ca3205 lavfi: handle NULL lists in avfilter_make_format_list 2011-06-08 18:50:07 +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 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
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
Stefano Sabatini e977ca2645 lavfi: add avfilter_link_free() function 
Allow to free the buffers cached in each AVFilterLink pool.
Fix leak.
 2011-06-03 00:41:32 +02:00
Mans Rullgard e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Stefano Sabatini 9e66b64c36 vsrc_buffer: propagate error code in av_vsrc_buffer_add_frame() 
Propagate av_vsrc_buffer_add_video_buffer_ref() error code rather than
return 0.
 2011-06-02 18:48:28 +02:00
Stefano Sabatini 665e608c8d lavfi: reindent after the previous commit 2011-06-02 18:48:25 +02:00
Stefano Sabatini 6f1dd6f45a lavfi: add braces around the block of an if() expression in avfilter_default_get_video_buffer 
Clarify code layout.
 2011-06-02 18:47:48 +02:00
Stefano Sabatini 0ff5cbedd2 lavfi: clarify the context of a comment in avfilter_default_get_video_buffer() 
The comment is meant to be about the align parameter.
 2011-06-02 18:24:50 +02:00
Stefano Sabatini 77b32b73ed lavfi: apply misc style fixes 
Adopt K&R style for overall consistency/readability.
 2011-06-02 18:24:49 +02:00
Reimar Döffinger 58fd70b04d Port remove of get_sws_cpuflags from MPlayer's libmpcodecs. 2011-06-02 08:38:09 +02:00
Reimar Döffinger 3379531c40 Port recent changes to MPlayer libmpcodecs. 
Also include an older fix for vf_smartblur which was essentially
broken due to reading the threshold value wrongly.
 2011-06-02 08:38:09 +02:00
Reimar Döffinger 2a30df09fd Replace non-existent HAVE_SSE2 with HAVE_SSE. 
Since this is only a compilation check (the actual function used is
selected at runtime) and HAVE_SSE indicates that we can also compile
SSE2 code, this is correct.
 2011-06-02 08:38:08 +02:00
Michael Niedermayer cd8cb54990 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: ac3dsp: optimised update_bap_counts()
  mpegaudiodec: Fix av_dlog() invocation.
  h264/10bit: add HAVE_ALIGNED_STACK checks.
  Update 8-bit H.264 IDCT function names to reflect bit-depth.
  Add IDCT functions for 10-bit H.264.
  mpegaudioenc: Fix broken av_dlog statement.
  Employ correct printf format specifiers, mostly in debug output.
  ARM: fix MUL64 inline asm for pre-armv6

Conflicts:
	libavcodec/mpegaudioenc.c
	libavformat/ape.c
	libavformat/mxfdec.c
	libavformat/r3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-02 05:12:10 +02:00