RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
30,125 Commits 36 Branches 398 Tags 239 MiB
Commit Graph

30125 Commits

Author SHA1 Message Date
Stefano Sabatini 88fc2e411e vf_split: add description 2011-05-22 02:43:46 +02:00
Stefano Sabatini 7d5297b343 vf_split: fix various nits 2011-05-22 02:43:46 +02:00
Michael Niedermayer eb97d4d611 wmadec: avoid infinit loop. 
Fixes ticket183

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 02:33:03 +02:00
Ramiro Polla a13fec8a9c DirectShow capture: Fix build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 21:53:15 +02:00
Kirill Gavrilov e6ec9212c5 matroska: switch stereo mode from int to string and add support in the demuxer too 2011-05-21 17:23:30 +02:00
Kirill Gavrilov 69a83da5d4 matroska: cosmetics 2011-05-21 17:23:30 +02:00
Alok Ahuja 8dd12b077b Create a stereo_mode metadata tag to specify the stereo 3d video layout using the StereoMode tag in a matroska/webm video track. 2011-05-21 17:23:29 +02:00
Bobby Bingham a38a00eddf libavfilter: vf_split from soc. 
Commited by michael, for detailed authorship see soc repo
 2011-05-21 17:23:29 +02:00
Ramiro Polla 95eb2e3a38 DirectShow capture support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 17:23:14 +02:00
Carl Eugen Hoyos f8c49d02b0 Fix channel_layout documentation. 
libavformat/riff.c has been writing channel_layout for as long as
the field exists.
 2011-05-21 11:18:54 +02:00
Michael Niedermayer 6d32bcd770 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: make executable again
  LATM/AAC: Free previously initialized context on reinit.
  configure: Do not unconditionally add -Wall to host CFLAGS.
  configure: Set OS/2 objformat to a.out.
  Add support for a.out object format to assembler macros.
  fate: disable threading for encoding
  fate: add comment field
  fate: allow overriding default build and install dirs
  mpegtsenc: Add an AVClass pointer to the private data
  mpegaudio: clean up #includes
  mpegaudio: move all header parsing to mpegaudiodecheader.[ch]

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 05:32:03 +02:00
Mike William 840238b870 ffserver: dont just crash 
With changes from ubitux.
 2011-05-21 04:50:59 +02:00
Maksym Veremeyenko ab1c19efc5 fix ffserver's SIGSEGV 2011-05-21 04:39:20 +02:00
Martin Storsjö 0eed5016a2 avoptions: Support getting flag values using av_get_int 2011-05-21 03:37:43 +02:00
Gianluigi Tiesi 1b30e4f586 preset dir for win32 2011-05-21 03:36:26 +02:00
Michael Niedermayer 0424e052f8 Merge remote-tracking branch 'ffmpeg-mt/master' 
* ffmpeg-mt/master:
      Update todo.
      h264: add an assert that copied pictures are valid picture pointers
      valgrind-check: run with 1 and 3 threads
      h264: When decoding a packet with multiple PPS/SPS, don't start the next thread until all of them have been read
      Allow some pictures to be released earlier after 51ead6d2c40c5defdd211f435aec49b19f5f6a18
      h264: fix slice threading MC reading uninitialized frame edges.

    Please see ffmpeg-mt for a list of authors of these changes.

    Conflicts:
        libavcodec/h264.c
        mt-work/valgrind-check.sh

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 03:11:50 +02:00
Michael Niedermayer 5c08c7b215 Add a flag to disable side data merging. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 02:31:27 +02:00
Michael Niedermayer 94eadee7ef Merge/split side data. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-21 02:31:27 +02:00
Carl Eugen Hoyos 007f773942 Encoding alac with more than two channels is not supported. 2011-05-21 01:11:42 +02:00
Mans Rullgard a1d0dcc713 configure: make executable again 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-20 18:11:31 +01:00
Ronald S. Bultje 42da8ea8e8 LATM/AAC: Free previously initialized context on reinit. 
Fixes memory leaks which are the result of overwriting already-initialized
MDCT contexts during context reinitialization, e.g. in valgrind
fate-aac-latm_000000001180bc60.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-20 18:24:53 +02:00
Diego Biurrun 0a6db2a25a configure: Do not unconditionally add -Wall to host CFLAGS. 
Some compilers choke on -Wall, so only add the flag after checking it works.
 2011-05-20 17:52:24 +02:00
Dave Yeo 9297f1ed15 configure: Set OS/2 objformat to a.out. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-20 17:52:23 +02:00
Dave Yeo d69f9a4234 Add support for a.out object format to assembler macros. 
This format is still used by e.g. OS/2.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-20 17:52:21 +02:00
Mans Rullgard 6da57043ea fate: disable threading for encoding 
This explicitly disables threading for encoding as slices are otherwise
automatically activated.  This should be dropped once option resetting
between files is fully implemented.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-20 13:50:52 +01:00
Mans Rullgard 5ffccc0056 fate: add comment field 
This adds a comment field to the report header, suitable for
extra information not covered by the automatic fields.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-20 13:50:52 +01:00
Mans Rullgard eb8da636af fate: allow overriding default build and install dirs 
This is useful e.g. for building in a different filesystem than
where the source is kept.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-20 13:50:52 +01:00
Martin Storsjö 50fefa10de mpegtsenc: Add an AVClass pointer to the private data 
Since a private class is set for this muxer, the callers will
assume that the private data starts with an AVClass pointer.
If no such member exists, the first few bytes of the struct
will be overwritten, and the class pointer may be broken at
any later time.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-05-20 15:16:09 +03:00
Mans Rullgard f255a28d14 mpegaudio: clean up #includes 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-20 11:05:19 +01:00
Mans Rullgard 0199e00bc8 mpegaudio: move all header parsing to mpegaudiodecheader.[ch] 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-20 11:05:07 +01:00
Stefano Sabatini f1b3f33d48 vf_libopencv: prefer opencv/cxcore.h over cxtypes.h 
Require the presence of opencv/cxcore.h in place of opencv/cxtypes.h,
which has been removed. Fix compilation with libopencv > 2.1.0.

Fix trac issue #221.
 2011-05-20 11:54:53 +02:00
Stefano Sabatini 125d807660 decoders.texi: fix typos in rawvideo section 2011-05-20 10:14:00 +02:00
Stefano Sabatini 950b358997 cmdutils: use const AVClass * when senseful 
Fix warnings:
cmdutils.c: In function ‘opt_default’:
cmdutils.c:304: warning: initialization discards qualifiers from pointer target type
cmdutils.c: In function ‘set_context_opts’:
cmdutils.c:431: warning: passing argument 2 of ‘alloc_priv_context’ discards qualifiers from pointer target type
cmdutils.c:414: note: expected ‘struct AVClass *’ but argument is of type ‘const struct AVClass *’
 2011-05-20 10:05:14 +02:00
Stefano Sabatini 52da548c7d encoders.texi: add documentation for the libx264 encoder 
Also remove -x264opts item from the ffmpeg manual, since it belongs to
the encoders section.
 2011-05-20 10:05:04 +02:00
Stefano Sabatini c5385147cd decoders.texi: add documentation for rawvideo decoder and options 2011-05-20 10:02:24 +02:00
Stefano Sabatini 5e45f03420 doc: add decoders.texi file 2011-05-20 10:00:00 +02:00
Stefano Sabatini d4111e525d encoders.texi: decrease level for audio encoders section 
Make Audio Encoders a separate chapter, and decrese the contained
sections level by one.

Improve rendering, and improve consistency with the other parts of the
manual.
 2011-05-20 09:59:00 +02:00
Stefano Sabatini 1e31ea71ff ffprobe.texi: remove inclusion of muxers section 
Muxers are not used by ffprobe.
 2011-05-20 09:34:57 +02:00
Stefano Sabatini 7f58eb3c2b indeo3: release buffer in indeo3_decode_end() 
Fix leak.
 2011-05-20 09:34:57 +02:00
Stefano Sabatini 5443812fbc indeo3: remove unnecessary includes 2011-05-20 09:34:57 +02:00
Stefano Sabatini a469c32478 indeo3: add @file doxy and a link to multimedia wiki documentation 2011-05-20 09:34:57 +02:00
Stefano Sabatini 0d65e0f8cb cmdutils: reset *picref_ptr to NULL in get_filtered_frame() 
Avoid the presence of an invalid pointer, fix a crash in case of
get_filtered_frame() failure.
 2011-05-20 09:34:57 +02:00
Stefano Sabatini 328810390d ffmpeg: remove useless NULL-check on avfilter_unref_buffer 
The check is no more required since recent changes in the
avfilter_unref_buffer(), the check is done in the function.
Simplify.
 2011-05-20 09:34:56 +02:00
Stefano Sabatini ed96fffb6e libmp3lame: include "libavutil/intreadwrite.h" header 
Fix compilation.
 2011-05-20 09:34:56 +02:00
Michael Niedermayer 80d156d7fd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  qdm2: Use floating point synthesis filter.
  h264: correct border check.
  h264: fix loopfilter with threading at slice boundaries.
  Fix ff_mpa_synth_filter_fixed() prototype
  Rename costablegen.c ---> cos_tablegen.c.
  Collapse tableprint.c into tableprint.h.
  Simplify trig table rules
  Remove potentially unstable filenames from comments in generated files.
  Ignore generated tables and generated table generator programs.
  Simplify CLEANFILES make variable by using wildcards.
  Remove silly insults from avformat_version() Doxygen documentation.
  mpegaudiodsp: fix x86 and ppc makefiles
  configure: Adjust AVX assembler check.
  mpegaudio: remove unused version of SAME_HEADER_MASK
  mpegaudio: remove useless #undef at end of file
  asfdec: add missing #include for av_bswap32()
  mpegaudio: merge two #if CONFIG_FLOAT blocks
  mpegaudio: move some struct definitions from mpegaudio.h
  Move some mpegaudio functions to new mpegaudiodsp subsystem

Conflicts:
	libavcodec/h264.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-20 05:48:22 +02:00
Vitor Sessak 984ece7503 qdm2: Use floating point synthesis filter. 
This avoid needlessly convertion from floating point to fixed point and back.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-19 20:32:18 -04:00
Ronald S. Bultje 4e987f8282 h264: correct border check. 
When backing up the top-left border, check that the top-left
(rather than left) MB indeed does belong to our slice. If it
doesn't, backing up has no positive effect but may accidentally
interfere with other threads writing in the same space.

Fixes occasional one-off effects when enabling slice-MT.
 2011-05-19 20:32:18 -04:00
Ronald S. Bultje 0ffc841505 h264: fix loopfilter with threading at slice boundaries. 2011-05-19 20:32:17 -04:00
Mans Rullgard 89a2098735 Fix ff_mpa_synth_filter_fixed() prototype 
The prototype should use the same typedefs as the definition, or it
will fail where int32_t is not int (DOS apparently).

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-20 01:20:53 +01:00
Martin Storsjö 6efb29686f Reindent 2011-05-20 01:44:10 +02:00