1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

43681 Commits

Author SHA1 Message Date
Michael Niedermayer
7e49474aa0 ffmenc: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-18 05:02:58 +02:00
Michael Niedermayer
b5abebe164 acelp_filters: switch to avassert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-18 05:02:08 +02:00
Michael Niedermayer
ceb8773e16 libvpxenc: Fix CQ encoding without a specified bitrate
Also print a warning if neither quality nor bitrate is specified
and use the libvpx default bitrate in this case.

The idea of using the default bitrate is from Luca Barbato
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 22:03:02 +02:00
Michael Niedermayer
1ee7a2955f libvpxenc: only force CBR if a bitrate is set
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 21:56:58 +02:00
Nedeljko Babic
6f98e298cc mips: change list of files with MIPS copyright notice in mips.txt
Add files created for MP3 optimization that have MIPS copyright
 notice in them to list of files in mips.txt.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 18:54:50 +02:00
Nedeljko Babic
2b02bc6422 mips: add assembler flags for mips32r2 ISA and mhard-float
For some compilers ISA older than mips32r2 is set as default.
 Because of them assembler flag "-mips32r2" needs to be added
 for CPUs that support mips32r2 ISA in part of configure script
 where ISA capabilities are checked.
"-mhard-float" assembler flag is also added for CPUs that have FPU.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 18:54:41 +02:00
Nicolas George
9341bbfc51 vf_yadif: fix permissions.
Require AV_PERM_PRESERVE and leave harmless permissions
alone for the next filter.
2012-08-17 18:26:42 +02:00
Nicolas George
71adb74059 vf_tinterlace: leave harmless permissions alone. 2012-08-17 18:26:42 +02:00
Nicolas George
d37f823207 vf_thumbnail: fix permissions. 2012-08-17 18:26:42 +02:00
Nicolas George
469d07a0e4 vf_select: require AV_PERM_PRESERVE.
This is only necessary because of the poll_frame implementation.
Removing it altogether would be another solution.
2012-08-17 18:26:42 +02:00
Nicolas George
f6647d8825 vf_removelogo: fix permissions.
The branch with the test was already impossible.
2012-08-17 18:26:41 +02:00
Nicolas George
616c3f3ee2 vf_overlay: fix permissions. 2012-08-17 18:26:41 +02:00
Nicolas George
5ec6ae91ba vf_idet: fix permissions.
Only write needs to be removed, other can be left.
2012-08-17 18:26:41 +02:00
Nicolas George
3bc644e044 vf_fps: fix permissions. 2012-08-17 18:26:41 +02:00
Nicolas George
738fab17ea vf_fieldorder: fix permissions. 2012-08-17 18:26:41 +02:00
Nicolas George
3c0cc3ae67 vf_fade: fix permissions. 2012-08-17 18:26:41 +02:00
Nicolas George
d5765d4725 vf_drawtext: fix permissions. 2012-08-17 18:26:41 +02:00
Nicolas George
0238806f64 vf_drawtext: fix permissions. 2012-08-17 18:26:40 +02:00
Nicolas George
84923555bb vf_deshake: fix permissions. 2012-08-17 18:26:40 +02:00
Nicolas George
f3133a48e5 vf_delogo: fix permissions. 2012-08-17 18:26:40 +02:00
Nicolas George
12ff3faec0 vf_colormatrix: fix permissions. 2012-08-17 18:26:40 +02:00
Nicolas George
ceb8dc1e04 vf_ass: fix permissions. 2012-08-17 18:26:40 +02:00
Nicolas George
07663871e1 vf_alphamerge: fix permissions. 2012-08-17 18:26:40 +02:00
Nicolas George
de35d2b498 avf_concat: fix permissions. 2012-08-17 18:26:39 +02:00
Nicolas George
44127c0489 af_channelmap: fix permissions. 2012-08-17 18:26:39 +02:00
Nicolas George
368f368e59 af_channelmap: require AV_PERM_PRESERVE. 2012-08-17 18:26:39 +02:00
Nicolas George
44aeb06290 fifo: fix permissions. 2012-08-17 18:26:39 +02:00
Nicolas George
a34eb393fc split: set rej_perms = AV_PERM_WRITE on outputs. 2012-08-17 18:26:39 +02:00
Nicolas George
a0d274d228 sink_buffer: require AV_PERM_PRESERVE. 2012-08-17 18:26:39 +02:00
Nicolas George
e54e30c889 lavfi: grant all permissions on mallocated audio buffers.
The permissions not requested by the filter that created
the buffer may be useful for a later filter and avoid a copy.
2012-08-17 18:26:38 +02:00
Nicolas George
cc8104b908 lavfi: fix erroneous use of AV_PERM_PRESERVE in ff_inplace_start_frame.
ff_inplace_start_frame looks useless anyway.
2012-08-17 18:26:38 +02:00
Nicolas George
046eb21c72 lavfi: grant all permissions on mallocated video buffers.
The permissions not requested by the filter that created
the buffer may be useful for a later filter and avoid a copy.
2012-08-17 18:26:38 +02:00
Michael Niedermayer
fa3fde168b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libvpxenc: use the default bitrate if not set
  utvideo: Rename utvideo.c to utvideodec.c
  doc: Fix syntax errors in sample Emacs config
  mjpegdec: more meaningful return values
  configure: clean up Altivec detection
  getopt: Remove an unnecessary define
  rtmp: Use int instead of ssize_t
  getopt: Add missing includes
  rtmp: Add support for receiving incoming streams
  Add missing includes for code relying on external libraries

Conflicts:
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/mjpegdec.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 17:06:52 +02:00
Luca Barbato
4aa3d7b3f2 libvpxenc: use the default bitrate if not set
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-08-17 12:47:45 +02:00
Jan Ekström
77f47e3288 utvideo: Rename utvideo.c to utvideodec.c
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2012-08-17 12:36:55 +02:00
Jordi Ortiz
fd6a085a22 doc: Fix syntax errors in sample Emacs config
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-08-17 10:59:42 +02:00
Clément Bœsch
517a2bbcf1 lavfi/edgedetect: add rounding for high/low threshold.
This should fix the 32-bit FATE instances where low_u8=19 and high_u8=49.
2012-08-17 08:08:07 +02:00
Michael Niedermayer
7e5a622525 escape124: Fix long == 64 assumtation.
Found-by: Nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 07:16:16 +02:00
Michael Niedermayer
3a1ca240d9 ccitt fax: fix some group3 1d files without EOL
Fixes Ticket832

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 02:58:41 +02:00
Luca Barbato
0f64cd1e81 mjpegdec: more meaningful return values 2012-08-17 01:29:19 +02:00
Mans Rullgard
20bcce507a configure: clean up Altivec detection
There used to be one test for Altivec intrinsics support and a
separate test to determine which of two possible syntaxes to use
for vector literals.  Since 2008, we only support the more common
of these so the split test no longer makes sense.

This combines the tests into one and also changes the hard error on
failure to a warning.  The test can reasonably fail if no --cpu flag
is provided (or is provided with an unknown CPU) and the compiler
default target does not support Altivec.  Aborting in this case is
probably over-reacting.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-16 23:15:38 +01:00
Michael Niedermayer
3d7817048c escape124: fix integer overflow leading to excessive memory allocation
Fixes Ticket1629

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 22:28:29 +02:00
Martin Storsjö
962e912a49 getopt: Remove an unnecessary define
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-16 23:12:50 +03:00
Michael Niedermayer
4b529edff8 deprecate av_parse_cpu_flags
This function is problematic in several ways, its also quite
unpredictable which flags it ends up turning on

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 22:04:46 +02:00
Michael Niedermayer
540bd5a95f av_parse_cpu_caps: add "mmxext" as alias for mmx2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 22:04:46 +02:00
Michael Niedermayer
e71df841ee fft-test: switch to new cpu flags API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 22:04:46 +02:00
Clément Bœsch
3250231a02 lavfi: add edgedetect filter. 2012-08-16 22:03:32 +02:00
Martin Storsjö
cb5ab02a88 rtmp: Use int instead of ssize_t
Not all compilers support ssize_t (MSVC doesn't), and none of these
variables need to be larger than 32 bit.

Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-16 23:02:26 +03:00
Martin Storsjö
da8201cc82 getopt: Add missing includes
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-16 22:25:13 +03:00
Nicolas George
12d2bbf324 lavfi/movie: extend a doxygen comment. 2012-08-16 20:36:45 +02:00