Commit Graph

31881 Commits

Author SHA1 Message Date
Kostya Shishkov 9791c02733 Saner RV1/2 initialisation and RV2 header parsing.
Old version was based on lots of guesswork which had different hacks based on
32-bit version field instead of splitting it into major/minor/micro version.
RV2 picture header parser also had a few places where it deviated from binary
decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-08-08 17:23:07 -07:00
Carl Eugen Hoyos f8dc2e51aa ffmpeg: fix passlogfile regression 2011-08-09 01:11:37 +02:00
Michael Niedermayer 9a5f61ac62 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libx264: do not set pic quality if no frame is output
  libx264: add preset, tune, profile and fastfirstpass private options

Conflicts:
	libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-09 00:01:48 +02:00
Baptiste Coudurier 5caa2de19e libx264: do not set pic quality if no frame is output
Avoids uninitialized reads.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-08-08 14:33:09 +02:00
Baptiste Coudurier 07a227b432 libx264: add preset, tune, profile and fastfirstpass private options
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-08-08 14:33:09 +02:00
Stefano Sabatini 640a905ece lavfi: remove gradfun mp wrapper
The gradfun filter was already integrated natively in libavfilter.
Both filters issue the same output, and have a comparable performance.

See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: remove gradfun mp wrapper
Date: Fri,  5 Aug 2011 00:19:04 +0200
2011-08-07 17:43:02 +02:00
Michael Niedermayer 6c4e9cae52 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: fix misspelling in comment
  aac: propagate error return values for AV_LOG_ERROR-triggering events

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-07 00:32:19 +02:00
Stefano Sabatini 4646ef87b1 lavfi: fix registration name for the buffersink sink
Previously both the buffer and buffersink elements were associated to
the "BUFFER" symbol in allfilters.c, so it was not possible to enable
one without the other.
2011-08-06 13:18:09 +02:00
Stefano Sabatini 3c56a421d8 lavfi: avoid void* arithmetic in defaults.c:set_common_formats()
void* pointer arithmetic semantics is undefined, use uint8_t* instead.

Also fix GCC warnings:
defaults.c: In function ‘set_common_formats’:
defaults.c:184: warning: pointer of type ‘void *’ used in arithmetic
defaults.c:189: warning: pointer of type ‘void *’ used in arithmetic
2011-08-06 13:18:09 +02:00
Mina Nagy Zaki a8dcf5eebb lavfi: add asink_abuffer - audio buffer sink
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-08-06 13:17:49 +02:00
Mina Nagy Zaki 3e12b5893d lavfi: fix doxygen doc for config_props() callback
Update/extend documentation related to the link fields to set, and fix
a pads->filters braino.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-08-06 12:14:37 +02:00
Mina Nagy Zaki 5f68a91be2 lavfi: remove default config_props() callback and refactor avfilter_config_links()
Link properties have to be checked after config_props() is called to
make sure everything is sane, so the default config_props() for output
links was redundant.

Also remove channel_layout check as it is now negotiated.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
2011-08-06 12:13:18 +02:00
Stefano Sabatini 4b7889453e lavfi: remove avfilter_default_config_input_link() declaration
The function is not implemented (and possibly useless).
2011-08-06 12:11:12 +02:00
Dustin Brody b2700a5c7c lavc: fix misspelling in comment
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-08-05 18:18:38 -07:00
Michael Niedermayer 3e32bf3dbd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lsws: remove optimization debug logs in sws_init_context()
  lsws: use array for storing the supported in/out information

Conflicts:
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-05 21:47:21 +02:00
Dustin Brody 680b1852ab aac: propagate error return values for AV_LOG_ERROR-triggering events 2011-08-05 12:35:49 -07:00
Michael Niedermayer 6e19cfb083 ffmpeg: Fix doxygen comments for MetadataMap
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-05 01:18:40 +02:00
Stefano Sabatini 6a92551234 lsws: remove optimization debug logs in sws_init_context()
The logged information is possibly false, and it tends to be outdated
after each change since the logging code needs to be manually updated.

Simplify and prevent confusing wrong debug messages.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-05 00:45:06 +02:00
Stefano Sabatini 347167ecf5 lsws: use array for storing the supported in/out information
Also remove the unnecessary isSupportedIn/Out macros.

Make the code more compact/readable, and simplify the access to
lsws-specific pixel format information.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-05 00:44:11 +02:00
Stefano Sabatini 48734a54e8 filters.texi: fix wrong references in the "Filtergraph syntax" section 2011-08-04 23:50:29 +02:00
Michael Niedermayer 84a6abd954 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  applehttp: fix variant discard logic
  h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-04 20:59:36 +02:00
Stefano Sabatini 82b1516a85 yadif: correct documentation on the parity parameter
0 is top-field-first, 1 is bottom-field-first, not the other way
around.

Fix trac issue #380.
2011-08-04 19:09:57 +02:00
Michael Niedermayer 9e63720b4b mpegvideo.h: remove the 1 line difference to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-04 17:05:07 +02:00
Luca Barbato 1bf6cb85be applehttp: fix variant discard logic
The v->ctx is always not NULL now, check for streams presence to
mark the read_header state.

Fixes bug #25, possibly introduced by 603b8bc
2011-08-04 11:21:33 +02:00
Carl Eugen Hoyos 31fe5d9825 Fix possible crash when decoding mpeg streams.
This reverts 2cf8355f98,
fixes ticket 329.
2011-08-04 11:06:43 +02:00
Alex Converse ad62507f32 h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME. 2011-08-03 17:56:47 -07:00
Michael Niedermayer 64160ef392 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  arm: Avoid using the movw instruction needlessly
  Move an int64_t down in MpegEncContext

Conflicts:
	libavcodec/arm/ac3dsp_armv6.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-04 01:40:29 +02:00
Michael Niedermayer 72b0c9f55f avidec: skip seek pos adjustment for non interleaved files.
Fixes Ticket327

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-04 01:33:40 +02:00
Stefano Sabatini 4ce0a94656 lsws: remove deprecated and unused stuff after the 0->1 major bump 2011-08-04 00:23:00 +02:00
Diego Biurrun fed6c90b68 cosmetics: remove some stray comments from AVCodec declarations 2011-08-03 23:31:45 +02:00
Diego Biurrun 933a6fd5a1 cosmetics: fix indentation/alignment in AVCodec declarations 2011-08-03 23:31:45 +02:00
Reimar Döffinger 99c7b51641 Abort if command offset decreases, avoids potential endless loop.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-08-03 20:09:53 +02:00
Reimar Döffinger 1816addc4e Warn when falling back to unreliable UMF fps tag.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-08-03 20:06:38 +02:00
Michael Niedermayer 46eaaad8dd Detect NI-avi at playtime like mplayer.
Fixes Ticket333

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-03 19:02:33 +02:00
Michael Niedermayer 652c772981 avidec: Fix XAN DPCM demuxing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-03 19:02:33 +02:00
Carl Eugen Hoyos 324b8adca4 Fix a possible miscompilation of cabac with old (broken) compilers. 2011-08-03 13:09:42 +02:00
Carl Eugen Hoyos 08d2cee49c Fix -loop_input. 2011-08-03 11:45:33 +02:00
Carl Eugen Hoyos eb29649cad Set bits_per_coded_sample when encoding ADPCM. 2011-08-03 11:45:33 +02:00
Stefano Sabatini f1b7c7e697 vf_boxblur: call avfilter_draw_slice() at the end of draw_slice() 2011-08-03 11:18:15 +02:00
Stefano Sabatini a342517710 vf_boxblur: fix out-of-buffer access when h > w
Increase size of the private temporary buffers from w to FFMAX(w, h),
indeed they are used also for blurring vertical lines with length h.
2011-08-03 11:18:15 +02:00
Stefano Sabatini d68ba3feb8 vf_boxblur: prefer the name "len" over "w" in the blur routines
Make more clear the meaning of the variables. They specify the length
of a (vertical or horizontal) line rather than a width.
Less confusing.
2011-08-03 11:18:15 +02:00
Måns Rullgård 9a83adaf34 arm: Avoid using the movw instruction needlessly
This fixes building for ARM11 without Thumb2.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-08-03 11:56:58 +03:00
Martin Storsjö d0a2f0af9d Move an int64_t down in MpegEncContext
This allows using the same arm assembler offsets for both EABI
and the mach-o ABI.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-08-03 11:56:56 +03:00
Michael Niedermayer 1d186e9e12 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."
  swscale: use 15-bit intermediates for 9/10-bit scaling.
  dct32: Add SSE2 ASM optimizations
  Correct chroma vector calculation for RealVideo 3.
  lavf: Add an option to discard corrupted frames
  mpegts: Mark wrongly-sized packets as corrupted
  mpegts: Move scan test to handle_packets
  mpegts: Mark corrupted packets
  mpegts: Reset continuity counter on seek
  mpegts: Fix for continuity counter
  mpegts: Silence "can't seek" warning on unseekable
  apichange: add an entry for AV_PKT_FLAG_CORRUPT
  avpacket: signal possibly corrupted packets
  mpeg4videodec: remove dead code that would have detected erroneous encoding
  aac: Remove some suspicious illegal memcpy()s from LTP.
  bink: Eliminate unnecessary shadow declaration.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavformat/avformat.h
	libavformat/options.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-02 22:12:18 +02:00
Ronald S. Bultje 62ee0e6a97 Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."
This reverts commit ac0fb59348. It
causes valgrind errors which I'll want to investigate before
resubmitting this.
2011-08-02 12:27:43 -07:00
Ronald S. Bultje ac0fb59348 swscale: use 15-bit intermediates for 9/10-bit scaling. 2011-08-02 10:34:02 -07:00
Vitor Sessak 18b131de04 dct32: Add SSE2 ASM optimizations
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-08-02 10:17:29 -07:00
Kostya Shishkov 6f7fe4723b Correct chroma vector calculation for RealVideo 3.
Old version divided it wrong, which resulted in chroma drift (visible on FATE
sample too as dirty trails left by clouds).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-08-02 08:23:47 -07:00
Zohar Kelrich 73e8e8dbf9 lavf: Add an option to discard corrupted frames
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-02 02:52:41 +02:00
Zohar Kelrich 5081514269 mpegts: Mark wrongly-sized packets as corrupted
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-08-02 02:52:41 +02:00