1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

30443 Commits

Author SHA1 Message Date
Vitor Sessak
165c7c420d Fix dct32() compilation with --disable-yasm
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-05-22 07:10:19 -04:00
Michael Niedermayer
bf8bb94322 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
	Changelog
	libavcodec/svq3.c
	libavcodec/x86/dct32_sse.c
	libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-22 04:53:19 +02:00
Michael Niedermayer
33adcdb531 mpeg2dec: Fix lowres 3
Fixes ticket212

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-22 03:32:08 +02:00
Stefano Sabatini
af2ed4b748 lavfi: bump minor and add changelog entry after the split filter addition 2011-05-22 02:43:48 +02:00
Stefano Sabatini
8a5b71d0c3 vf_split: add documentation to filters.texi 2011-05-22 02:43:47 +02:00
Stefano Sabatini
6f5a145be1 vf_split: give more meaningful names to the output pads
Rename "default" -> "output1", "default2" -> output2.
2011-05-22 02:43:47 +02:00
Stefano Sabatini
de1100a00a vf_split: define draw_slice() before end_frame()
Improve logical coherence, fix nit.
2011-05-22 02:43:46 +02:00
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
Anton Khirnov
71cc331cab ffmpeg: get rid of the -vglobal option.
It's badly documented and does the same thing as -flags global_header,
so it's redundant.
2011-05-21 21:25:58 +02:00
Vitor Sessak
6204feb160 dct32: Add AVX implementation of 32-point DCT 2011-05-21 17:42:26 +02:00
Vitor Sessak
4e653b98c8 dct32: Change pass 6 permutation to allow for AVX implementation 2011-05-21 17:42:26 +02:00
Vitor Sessak
3758eb0eb9 dct32: port SSE 32-point DCT to YASM 2011-05-21 17:42:26 +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
Diego Biurrun
153382e1b6 multiple inclusion guard cleanup
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
2011-05-21 13:48:10 +02:00
Can Wu
d49051e074 avio: document buffer must created with av_malloc() and friends
Else a later buffer resize in ffio_set_buf_size() will ABORT.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-21 13:42:50 +02:00
Can Wu
9e2dabed4a avio: check AVIOContext malloc failure
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-21 13:42:50 +02:00
Clément Bœsch
7d4c4394b5 swscale: point out an alternative to sws_getContext
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-21 13:42:50 +02:00
Ronald S. Bultje
cdca7c378e svq3: Do initialization after parsing the extradata
If done before, some parameters aren't known yet.

With svq3/rtp, initializing before some parameters are known
can lead to calling av_malloc(0), which on OS X currently returns
broken pointers.
2011-05-21 07:40:56 -04: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
Reinhard Tartler
21bbca5b44 add changelog entries for 0.7_beta2 2011-05-21 09:06:58 +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
Ronald S. Bultje
03c804e1ed mp3lame: add #include required for AV_RB32 macro.
Fixes compilation with mp3lame enabled.
2011-05-20 15:28:29 -04: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