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

25 Commits

Author SHA1 Message Date
Michael Niedermayer faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Michael Niedermayer 5d4fd1d1ad Merge remote-tracking branch 'qatar/master' 
* qatar/master: (36 commits)
  ARM: allow unaligned buffer in fixed-point NEON FFT4
  fate: test more FFT etc sizes
  dca: set AVCodecContext frame_size for DTS audio
  YASM: Shut up unused variable compiler warning with --disable-yasm.
  x86_32: Fix build on x86_32 with --disable-yasm.
  iirfilter: add fate test
  doxygen: Add qmul docs.
  ogg: propagate return values and return more meaningful error values
  H.264: fix overreads of qscale_table
  Remove unused static tables and static inline functions.
  eval: clear Parser instances before using
  dct-test: remove 'ref' function pointer from tables
  build: Remove deleted 'check' target from .PHONY list.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  mxfenc: small typo fix
  doxygen: Fix documentation for some VP8 functions.
  sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t*
  des: allow unaligned input and output buffers
  aes: allow unaligned input and output buffers
  ...

Conflicts:
	libavcodec/dct-test.c
	libavcodec/libvpxenc.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/h264_qpel_mmx.c
	libavfilter/x86/gradfun.c
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-05 02:26:17 +02:00
Robert Swain 954a653216 vorbis: vpxenc: Add missing include for av_rescale* 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-04 09:39:24 +01: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
James Zern 88aa215939 vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping 
via the equivalent AVCodecContext::mb_threshold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-28 12:15:59 +02:00
James Zern a138121bf1 webm: Additional options/presets for VP8 encodes under FFmpeg 2011-05-26 22:00:40 +02:00
Stefano Sabatini ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini 975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +02:00
James Zern 8eeed0db05 vpxenc: add CQ_LEVEL mapping 
via the equivalent AVCodecContext::crf modifying the range allowed by
options.c (0-51 -> 0-63)
update configure check to require libvpx 0.9.6 (Bali)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-12 03:54:28 +02:00
James Zern a299a261de vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping 
via the equivalent AVCodecContext::mb_threshold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-12 03:53:56 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Diego Elio Pettenò e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
James Zern 9d845ca40c Avoid rollover in settings conversion. 
Patch by James Zern, jzern google

Originally committed as revision 25941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-12 16:27:32 +00:00
James Zern 2aa72ecccc Add new -slices option and use it for libvpx and libx264. 
Patch by James Zern, jzern google

Originally committed as revision 25551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-22 18:09:14 +00:00
Benoit Fouet 1aa15491f2 Fix doxygen comments. 
/**\u2264 => /**<

Originally committed as revision 24661 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-02 07:25:25 +00:00
James Zern 53cf47829a Map rc_buffer_size to and c_initial_buffer_occupancy to their libvpx 
counterparts.

Patch by James Zern, jzern at google

Originally committed as revision 24566 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 08:02:35 +00:00
James Zern 7eb185e0a3 Map settings for 2-pass libvpx encoding. 
Patch by James Zern, jzern at google

Originally committed as revision 24430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-22 12:35:32 +00:00
James Zern f07c9895e0 Do not map video quantizer scale (from 1-51 to 0-63) for libvpx anymore. 
Patch by James Zern, jzern google

Originally committed as revision 24223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-12 21:23:03 +00:00
James Zern 83a68cd64f Set libvpx encoding profile to libavcodec's profile. 
Patch by James Zern, jzern google

Originally committed as revision 24201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-11 17:46:44 +00:00
Martin Storsjö 00ce2cbed5 libvpx: Set the libvpx frame dropping threshold to frame_skip_threshold 
The default for frame_skip_threshold is 0, which thus disables the libvpx
frame dropping.

Originally committed as revision 23522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 09:01:14 +00:00
James Zern 07777c2d5c libvpx: Don't use the VPX_KF_FIXED mode 
This mode emits no keyframes at all, despite its name.

Patch by James Zern, jzern at google dot com

Originally committed as revision 23521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 08:47:50 +00:00
James Zern 082a0a33c4 Use new macro AV_BASE64_SIZE. 
Patch by James Zern, jzern google com

Originally committed as revision 23515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-07 21:34:56 +00:00
James Zern ee0e91462c VP8 encoding via libvpx. 
Patch by James Zern, Google, Inc.

Originally committed as revision 23449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-03 20:47:59 +00:00