ffmpeg.git
8 years agoRename y400a to gray8a.
Baptiste Coudurier [Wed, 27 Apr 2011 19:36:30 +0000 (21:36 +0200)]
Rename y400a to gray8a.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix add_paeth_prediction_mmx for rgb48
Michael Niedermayer [Wed, 27 Apr 2011 17:54:32 +0000 (19:54 +0200)]
Fix add_paeth_prediction_mmx for rgb48
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomerge read and and in add_paeth_prediction
Michael Niedermayer [Wed, 27 Apr 2011 17:01:33 +0000 (19:01 +0200)]
merge read and and in add_paeth_prediction
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMove png mmx functions into x86/png_mmx.c, remove them from DSPContext.
Baptiste Coudurier [Wed, 27 Apr 2011 16:34:10 +0000 (18:34 +0200)]
Move png mmx functions into x86/png_mmx.c, remove them from DSPContext.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix decoding of DXSA subtitles.
Alexandre Colucci [Wed, 27 Apr 2011 16:39:57 +0000 (18:39 +0200)]
Fix decoding of DXSA subtitles.

These have a DXSA tag and contain alpha in addition to
color values for palette.

8 years agoWMADEC: fix ticket125
Michael Niedermayer [Wed, 27 Apr 2011 15:12:14 +0000 (17:12 +0200)]
WMADEC: fix ticket125
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert buggy hunk that leaked in from a libav merge.
Michael Niedermayer [Wed, 27 Apr 2011 12:03:37 +0000 (14:03 +0200)]
Revert buggy hunk that leaked in from a libav merge.
This unbreaks compilation with --disable-avfilter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo2: remove unnecessary release_buffer() call
Stefano Sabatini [Tue, 26 Apr 2011 11:50:08 +0000 (13:50 +0200)]
indeo2: remove unnecessary release_buffer() call

This was preventing reget_buffer() to return a buffer with the same
data, which was resulting in playback artifacts.

Fix trac issue #116.

8 years ago4xm: use reget_buffer() in decode_frame()
Stefano Sabatini [Tue, 26 Apr 2011 09:59:22 +0000 (11:59 +0200)]
4xm: use reget_buffer() in decode_frame()

Also remove unnecessary call to avctx->release_buffer(). reget_buffer
is required since apparently the codec needs to be feeded with the
previous frame data.

Releasing the frame and using get_buffer was working only in the case
get_buffer() was returning the old frame data, and resulting in
playback artifacts otherwise.

Fix trac issue #85.

8 years agoffplay: move output_picture() code to queue_picture()
Stefano Sabatini [Fri, 22 Apr 2011 09:54:31 +0000 (11:54 +0200)]
ffplay: move output_picture() code to queue_picture()

Move output_picture() code to queue_picture(), and remove it.
Simplify code path.

8 years agoffplay: rename video_refresh_timer() to video_refresh()
Stefano Sabatini [Fri, 22 Apr 2011 09:25:54 +0000 (11:25 +0200)]
ffplay: rename video_refresh_timer() to video_refresh()

The new name is shorter and less confusing.

8 years agoffplay: rename decode_thread to read_thread, parse_tid to read_tid
Stefano Sabatini [Fri, 22 Apr 2011 00:12:53 +0000 (02:12 +0200)]
ffplay: rename decode_thread to read_thread, parse_tid to read_tid

The new names are less misleading and more reciprocally consistent.

8 years agolavfi: add showinfo filter
Stefano Sabatini [Sat, 23 Apr 2011 18:55:34 +0000 (20:55 +0200)]
lavfi: add showinfo filter

8 years agolavfi: print key-frame and picture type information in ff_dlog_ref()
Stefano Sabatini [Sat, 23 Apr 2011 17:55:59 +0000 (19:55 +0200)]
lavfi: print key-frame and picture type information in ff_dlog_ref()

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoavparser: don't av_malloc(0).
Ronald S. Bultje [Wed, 27 Apr 2011 01:46:08 +0000 (18:46 -0700)]
avparser: don't av_malloc(0).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "Eliminate pointless '#if 1' statements without matching '#else'."
Michael Niedermayer [Wed, 27 Apr 2011 02:09:35 +0000 (04:09 +0200)]
Revert "Eliminate pointless '#if 1' statements without matching '#else'."

no comment

This reverts commit e6ff064845d02c43526c8a56dab121c219f16659.

Conflicts:

libavcodec/dsputil.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Wed, 27 Apr 2011 01:51:04 +0000 (03:51 +0200)]
Merge remote branch 'qatar/master'

* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
Changelog
doc/filters.texi
ffmpeg.c
libavcodec/ac3dec.h
libavcodec/dsputil.c
libavfilter/avfilter.h
libavfilter/vf_scale.c
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix runtime CPU detection in libswscale.
tateu [Tue, 26 Apr 2011 23:50:50 +0000 (01:50 +0200)]
Fix runtime CPU detection in libswscale.

8 years agovsrc_buffer: 10l mixed up input & output sizes. (funnily this worked 99% of the time...
Michael Niedermayer [Tue, 26 Apr 2011 21:52:22 +0000 (23:52 +0200)]
vsrc_buffer: 10l mixed up input & output sizes. (funnily this worked 99% of the time) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8 years agoac3enc: correct the flipped sign in the ac3_fixed encoder
Justin Ruggles [Tue, 5 Apr 2011 16:55:42 +0000 (12:55 -0400)]
ac3enc: correct the flipped sign in the ac3_fixed encoder

8 years agoAdd MxPEG decoder
anatoly [Mon, 28 Mar 2011 16:02:19 +0000 (20:02 +0400)]
Add MxPEG decoder

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd support for picture_ptr field in MJpegDecodeContext
anatoly [Sun, 27 Mar 2011 20:16:25 +0000 (22:16 +0200)]
Add support for picture_ptr field in MJpegDecodeContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMove MJPEG's input buffer preprocessing in separate public function
anatoly [Sun, 27 Mar 2011 20:16:24 +0000 (22:16 +0200)]
Move MJPEG's input buffer preprocessing in separate public function

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSupport reference picture defined by bitmask in MJPEG's SOS decoder
anatoly [Sun, 27 Mar 2011 20:16:23 +0000 (22:16 +0200)]
Support reference picture defined by bitmask in MJPEG's SOS decoder

With cleanup & simplification by me

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDCA/DTA encoder
Alexander E. Patrakov [Tue, 26 Apr 2011 19:07:55 +0000 (21:07 +0200)]
DCA/DTA encoder

8 years agoEliminate pointless '#if 1' statements without matching '#else'.
Diego Biurrun [Tue, 26 Apr 2011 11:52:12 +0000 (13:52 +0200)]
Eliminate pointless '#if 1' statements without matching '#else'.

8 years agoAdd AVX FFT implementation.
Vitor Sessak [Mon, 25 Apr 2011 09:39:01 +0000 (11:39 +0200)]
Add AVX FFT implementation.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoIncrease alignment of av_malloc() as needed by AVX ASM.
Vitor Sessak [Sat, 23 Apr 2011 17:24:31 +0000 (19:24 +0200)]
Increase alignment of av_malloc() as needed by AVX ASM.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoUpdate x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
Vitor Sessak [Sat, 23 Apr 2011 17:24:06 +0000 (19:24 +0200)]
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agovsrc_buffer: Reinit scale filter when an existing filter is used.
Michael Niedermayer [Tue, 26 Apr 2011 16:18:02 +0000 (18:18 +0200)]
vsrc_buffer: Reinit scale filter when an existing filter is used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovsrc_buffer: set output timebase when output equalization is done
Michael Niedermayer [Tue, 26 Apr 2011 16:17:20 +0000 (18:17 +0200)]
vsrc_buffer: set output timebase when output equalization is done
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovsrc_buffer: Set output size
Michael Niedermayer [Tue, 26 Apr 2011 16:16:48 +0000 (18:16 +0200)]
vsrc_buffer: Set output size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovsrc_buffer: fix NULL dereference
Michael Niedermayer [Tue, 26 Apr 2011 16:15:52 +0000 (18:15 +0200)]
vsrc_buffer: fix NULL dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobfi: store palette data in the context
Stefano Sabatini [Mon, 25 Apr 2011 18:26:15 +0000 (20:26 +0200)]
bfi: store palette data in the context

Store palette data in the codec context, do not assume that the frame
allocated the first time by avctx->get_buffer will be returned again.

This requires to store the palette which comes with the first frame in
the context, and copy it to the following frames.

Fix trac issue #84.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agomjpeg: Detect overreads in mjpeg_decode_scan() and error out.
Michael Niedermayer [Thu, 21 Apr 2011 20:03:24 +0000 (22:03 +0200)]
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rbultje@google.com>
8 years agodocumentation: extend documentation for ffmpeg -aspect option
Stefano Sabatini [Sat, 9 Apr 2011 11:49:49 +0000 (13:49 +0200)]
documentation: extend documentation for ffmpeg -aspect option

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoAPIChanges: update commit hashes for recent additions.
Anton Khirnov [Tue, 26 Apr 2011 06:51:54 +0000 (08:51 +0200)]
APIChanges: update commit hashes for recent additions.

8 years agolavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
Stefano Sabatini [Sat, 23 Apr 2011 11:38:50 +0000 (13:38 +0200)]
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums

Also deprecate av_get_pict_type_char() in favor of
av_get_picture_type_char().

The new enum and av_get_picture_type_char() are defined in libavutil.
This allows the use in libavfilter without the need to link against
libavcodec.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoaac: add headers needed for log2f()
Michael Niedermayer [Sat, 23 Apr 2011 08:44:21 +0000 (10:44 +0200)]
aac: add headers needed for log2f()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavc: remove FF_API_MB_Q cruft
Anton Khirnov [Tue, 12 Apr 2011 18:54:16 +0000 (20:54 +0200)]
lavc: remove FF_API_MB_Q cruft

8 years agolavc: remove FF_API_RATE_EMU cruft
Anton Khirnov [Tue, 12 Apr 2011 18:53:21 +0000 (20:53 +0200)]
lavc: remove FF_API_RATE_EMU cruft

8 years agolavc: remove FF_API_HURRY_UP cruft
Anton Khirnov [Tue, 12 Apr 2011 18:51:40 +0000 (20:51 +0200)]
lavc: remove FF_API_HURRY_UP cruft

8 years agopad: make the filter parametric
Stefano Sabatini [Sun, 17 Apr 2011 15:19:05 +0000 (17:19 +0200)]
pad: make the filter parametric

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agovsrc_movie: add key_frame and pict_type.
royger [Mon, 18 Apr 2011 15:50:16 +0000 (17:50 +0200)]
vsrc_movie: add key_frame and pict_type.

Signed-off-by: Roger Pau Monné <roger.pau@entel.upc.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agovsrc_movie: fix leak in request_frame()
Stefano Sabatini [Mon, 18 Apr 2011 17:21:25 +0000 (19:21 +0200)]
vsrc_movie: fix leak in request_frame()

Also set movie->picref to NULL, in order to avoid a crash in uninit()
when movie->picref is unreffed again and it was already freed.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
Roger Pau Monné [Sat, 16 Apr 2011 08:09:15 +0000 (10:09 +0200)]
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agovsrc_buffer: add sample_aspect_ratio fields to arguments.
Michael Niedermayer [Mon, 31 Jan 2011 19:48:35 +0000 (20:48 +0100)]
vsrc_buffer: add sample_aspect_ratio fields to arguments.

This fixes aspect handling in ffmpeg.

This is based on a patch by Baptiste.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavfi: add fieldorder filter
Mark Himsley [Sun, 10 Apr 2011 17:18:03 +0000 (19:18 +0200)]
lavfi: add fieldorder filter

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoscale: make the filter parametric
Stefano Sabatini [Sun, 27 Mar 2011 20:58:08 +0000 (22:58 +0200)]
scale: make the filter parametric

Make the filter accept parametric expressions for the output video
size.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoyadif: support 16-bit
James Darnley [Wed, 24 Nov 2010 20:25:09 +0000 (21:25 +0100)]
yadif: support 16-bit

Fixes by Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoyadif: support more than yuv420p.
James Darnley [Tue, 5 Apr 2011 00:45:10 +0000 (02:45 +0200)]
yadif: support more than yuv420p.

and correctly support grey8

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoyadif: Fix assert() failure
Michael Niedermayer [Sat, 2 Apr 2011 18:26:39 +0000 (20:26 +0200)]
yadif: Fix assert() failure

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Tue, 26 Apr 2011 02:12:43 +0000 (04:12 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  graphparser: add a NULL check on the argument passed to strstr
  setdar: prefer "sar" over "par" in log info message
  fade: fix draw_slice() check on fade->factor value
  fade: make draw_slice() chroma check against planes 1 and 2
  win32: include the correct header in cmdutils.c
  ac3: fix memleak in fixed-point encoder
  flashsv: Return more meaningful error values.
  flashsv: Employ explicit AVCodec struct initializers.
  read AVI palette from the end of extradata
  cosmetics: K&R coding style and more whitespace for Flash Screen Video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix issue1503, this fix may be incomplete we need more samples to know for sure.
Michael Niedermayer [Mon, 25 Apr 2011 23:45:17 +0000 (01:45 +0200)]
Fix issue1503, this fix may be incomplete we need more samples to know for sure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agowmadec: prevent null pointer call.
Michael Niedermayer [Mon, 25 Apr 2011 14:16:44 +0000 (16:16 +0200)]
wmadec: prevent null pointer call.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofraps: do not set avctx->pix_fmt to none in decode_init()
Stefano Sabatini [Mon, 25 Apr 2011 20:08:15 +0000 (22:08 +0200)]
fraps: do not set avctx->pix_fmt to none in decode_init()

This is required for setting up the filterchain, as it requires the
pixel format to be set, which is usually done when probing the file
with av_find_stream_info().

Fix trac issue #83.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agographparser: add a NULL check on the argument passed to strstr
Stefano Sabatini [Wed, 30 Mar 2011 19:30:31 +0000 (21:30 +0200)]
graphparser: add a NULL check on the argument passed to strstr

Fix crash in create_filter() which occurrs if a scale filter with no
args is provided.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agosetdar: prefer "sar" over "par" in log info message
Stefano Sabatini [Sat, 26 Mar 2011 14:49:07 +0000 (15:49 +0100)]
setdar: prefer "sar" over "par" in log info message

This is more consistent with the terminology adopted by the aspect
filter names.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agofade: fix draw_slice() check on fade->factor value
Mark Himsley [Fri, 18 Mar 2011 15:25:26 +0000 (15:25 +0000)]
fade: fix draw_slice() check on fade->factor value

draw_slice() checks that the fade factor is < 65536 and only
calculates the fade if so. But the fade factor is clipped in
end_frame() by av_clip_uint16() to 65535, so the fade is calculated
for every frame.  This patch alters the check so that it compares with
< 65535 (UINT16_MAX).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agofade: make draw_slice() chroma check against planes 1 and 2
Mark Himsley [Fri, 18 Mar 2011 14:42:29 +0000 (14:42 +0000)]
fade: make draw_slice() chroma check against planes 1 and 2

draw_slice() checks that planes 0 and 1 of AVFilterBufferRef's data
are not NULL before manipulating planes 1 and 2. This patch makes the
check against planes 1 and 2. More senseful and possibly more robust.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolsws: prevent overflow in sws_init_context()
Stefano Sabatini [Sun, 24 Apr 2011 23:17:08 +0000 (01:17 +0200)]
lsws: prevent overflow in sws_init_context()

In the loop:
    for (i=0; i<dstH; i++) {
        int chrI= i*c->chrDstH / dstH;

when i*c->chrDstH > INT_MAX this leads to an integer overflow, which
results in a negative value for chrI and in out-of-buffer reads. The
overflow is avoided by forcing int64_t arithmetic by casting i to
int64_t.

Fix crash, and trac issue #72.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoffplay: fix logic for selecting the show mode in case of missing video
Stefano Sabatini [Sun, 24 Apr 2011 22:49:18 +0000 (00:49 +0200)]
ffplay: fix logic for selecting the show mode in case of missing video

Also automatically select the show mode only if not specified by the
user.

Fix trac issue #109.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoffplay: name ShowMode enum
Stefano Sabatini [Sun, 24 Apr 2011 22:31:59 +0000 (00:31 +0200)]
ffplay: name ShowMode enum

Help debugging with GDB, maybe cleaner/safer.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agowin32: include the correct header in cmdutils.c
Luca Barbato [Mon, 25 Apr 2011 13:30:42 +0000 (15:30 +0200)]
win32: include the correct header in cmdutils.c

CommandLineToArgvW requires windows.h, include it directly

8 years agoac3: fix memleak in fixed-point encoder
Janne Grunau [Mon, 25 Apr 2011 16:56:40 +0000 (18:56 +0200)]
ac3: fix memleak in fixed-point encoder

caused by typo in mdct_end

8 years agoPatch from Packman (OpenSuse - packages) to silence rpmlint.
Manfred Tremmel [Mon, 25 Apr 2011 17:53:47 +0000 (19:53 +0200)]
Patch from Packman (OpenSuse - packages) to silence rpmlint.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSet start_time to 0 for raw audio files.
Reimar Döffinger [Sun, 24 Apr 2011 22:47:40 +0000 (00:47 +0200)]
Set start_time to 0 for raw audio files.

None of the raw audio files have timestamps, thus setting
start_time to 0 should be reasonable.

8 years agoRemove now unused audio_float configure option.
Reimar Döffinger [Mon, 25 Apr 2011 10:29:04 +0000 (12:29 +0200)]
Remove now unused audio_float configure option.

8 years agodca: allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 10:27:12 +0000 (12:27 +0200)]
dca: allow selecting float output at runtime.

8 years agovorbisdec: allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 10:22:26 +0000 (12:22 +0200)]
vorbisdec: allow selecting float output at runtime.

8 years agoaacdec: Allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 10:16:40 +0000 (12:16 +0200)]
aacdec: Allow selecting float output at runtime.

8 years agoac3dec: allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 09:59:28 +0000 (11:59 +0200)]
ac3dec: allow selecting float output at runtime.

8 years agoflashsv: Return more meaningful error values.
Diego Biurrun [Mon, 25 Apr 2011 14:01:58 +0000 (16:01 +0200)]
flashsv: Return more meaningful error values.

8 years agoflashsv: Employ explicit AVCodec struct initializers.
Diego Biurrun [Mon, 25 Apr 2011 00:22:46 +0000 (02:22 +0200)]
flashsv: Employ explicit AVCodec struct initializers.

8 years agoDo not set non_interleaved for DV-in-AVI.
Reimar Döffinger [Mon, 25 Apr 2011 11:54:26 +0000 (13:54 +0200)]
Do not set non_interleaved for DV-in-AVI.

It does not make sense (DV is interleaved by design) and
it avoids a crash when the non-interleaved code tries to
use the priv_data of streams created by the DV demuxer.
The crash could be avoided differently, but then that stream
would still lack an index and would not play correctly in
non-interleaved mode.
Fixes e.g. samples/ffmpeg-bugs/roundup/issue1514/Dennis0002_video1.avi

8 years agoWarn if the source has unsupported (or no) channel layout.
Carl Eugen Hoyos [Mon, 25 Apr 2011 09:23:06 +0000 (11:23 +0200)]
Warn if the source has unsupported (or no) channel layout.

8 years agoread AVI palette from the end of extradata
Kostya Shishkov [Sat, 23 Apr 2011 07:42:19 +0000 (09:42 +0200)]
read AVI palette from the end of extradata

Official AVI specification says that stream header in case of video contains
BITMAPINFO, which is equal to BITMAPINFOHEADER and optional palette. Currently
lavf AVI demuxer thinks otherwise which produces garbage on codecs that have
both palette and extradata (luckily, there are not so many such codecs).

An example of such file is:
http://samples.multimedia.cx/V-codecs/KMVC/baseball1.avi
(IIRC, MSS1 or MSS2 also had such situation but they are still not supported
by lavc).

As a side note, passing palette in extradata as it's been done previously is
not quite correct since proper _extra_ data is surplus bytes in
BITMAPINFOHEADER, not including palette.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoSet channel layout for 4 and 5.1 channel cdata audio files
Peter Ross [Mon, 25 Apr 2011 01:52:15 +0000 (11:52 +1000)]
Set channel layout for 4 and 5.1 channel cdata audio files

Patch from Carl Eugen Hoyos (cehoyos at ag dot or dot at)

Signed-off-by: Peter Ross <pross@xvid.org>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Mon, 25 Apr 2011 00:29:09 +0000 (02:29 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
  applehttp: Don't export variant_bitrate if it isn't known
  crypto: Use av_freep instead of av_free
  configure: Add missing libm library dependencies to .pc files.
  oggdec: reindent after 8f3eebd6
  configure: Add missing libavutil inter-library dependencies to .pc files.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCheck mmap() return against correct value
unknown author [Sun, 24 Apr 2011 23:48:46 +0000 (01:48 +0200)]
Check mmap() return against correct value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocosmetics: K&R coding style and more whitespace for Flash Screen Video
Diego Biurrun [Sun, 24 Apr 2011 12:47:54 +0000 (14:47 +0200)]
cosmetics: K&R coding style and more whitespace for Flash Screen Video

8 years agovorbisdec: Employ proper printf format specifiers for uint_fast32_t.
Diego Biurrun [Sun, 24 Apr 2011 17:49:39 +0000 (19:49 +0200)]
vorbisdec: Employ proper printf format specifiers for uint_fast32_t.

libavcodec/vorbisdec.c:543: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘uint_fast32_t’
libavcodec/vorbisdec.c:543: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘uint_fast32_t’

8 years agoSupport fourcc MMJP.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:43:13 +0000 (00:43 +0200)]
Support fourcc MMJP.

Fixes ticket #107.

8 years agoSupport fourcc XVIX.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:35:59 +0000 (00:35 +0200)]
Support fourcc XVIX.

Fixes ticket #106.

8 years agoSupport fourcc M263.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:27:03 +0000 (00:27 +0200)]
Support fourcc M263.

Fixes ticket #103.

8 years agoSupport fourcc auv2.
ami_stuff [Sun, 24 Apr 2011 22:20:27 +0000 (00:20 +0200)]
Support fourcc auv2.

Fixes ticket #101.

8 years agoFix indentation.
Reimar Döffinger [Sun, 24 Apr 2011 22:02:36 +0000 (00:02 +0200)]
Fix indentation.

8 years agoSupport PARSER_FLAG_COMPLETE_FRAMES for h261 and h263 parsers.
Reimar Döffinger [Sun, 24 Apr 2011 17:17:17 +0000 (19:17 +0200)]
Support PARSER_FLAG_COMPLETE_FRAMES for h261 and h263 parsers.

8 years agoffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlay
Stefano Sabatini [Fri, 22 Apr 2011 15:11:23 +0000 (17:11 +0200)]
ffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlay

In video_image_display(), fix exception occurring when the size of the
rectangle passed to SDL_DisplayYUVOverlay() is 0x0, which happens when
interactively resizing the SDL window.
This is done by forcing the minimum size to 1x1.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoavi: try to synchronize the points in time of the starts of streams after seeking.
Michael Niedermayer [Sun, 24 Apr 2011 20:38:05 +0000 (22:38 +0200)]
avi: try to synchronize the points in time of the starts of streams after seeking.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd flag to force demuxers to sort more strictly by dts.
Michael Niedermayer [Sun, 24 Apr 2011 19:29:35 +0000 (21:29 +0200)]
Add flag to force demuxers to sort more strictly by dts.
This enables non interleaved AVI mode for example.
Players that are picky on strict interleaving can set this.
Patches to only switch to non intereaved AVI mode when the index is not strictly
correctly interleaved are welcome.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoapplehttp: Don't export variant_bitrate if it isn't known
Martin Storsjö [Sun, 24 Apr 2011 17:19:49 +0000 (20:19 +0300)]
applehttp: Don't export variant_bitrate if it isn't known

If there are no variants, the total bitrate of the single
stream isn't known, and exporting variant_bitrate = 0 does
look weird, since there really aren't any variants.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agocrypto: Use av_freep instead of av_free
Martin Storsjö [Sun, 24 Apr 2011 17:10:37 +0000 (20:10 +0300)]
crypto: Use av_freep instead of av_free

Using av_freep is generally good practice.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoCrystalHD: Add AVOption to configure hardware downscaling.
Philip Langdale [Thu, 21 Apr 2011 04:41:43 +0000 (21:41 -0700)]
CrystalHD: Add AVOption to configure hardware downscaling.

The CrystalHD hardware can do scaling, which is particularly
desirable when dealing with some high resolution clips that take
so long to decode and copy out that they end up playing back
slower than realtime. By using scaling, we can make the output
frames smaller and reduce the copy out time.

This option takes the desired horizontal width in pixels, and
the hardware will do an aspect-scale. Upscaling is not supported
and the hardware will simply ignore any request to do so.

Signed-off-by: Philip Langdale <philipl@overt.org>
8 years agoCheck for malloc failures in fraps decoder.
Reimar Döffinger [Sun, 24 Apr 2011 12:49:29 +0000 (14:49 +0200)]
Check for malloc failures in fraps decoder.

8 years agoUse av_fast_malloc instead of av_realloc in fraps decoder.
Reimar Döffinger [Sun, 24 Apr 2011 12:39:07 +0000 (14:39 +0200)]
Use av_fast_malloc instead of av_realloc in fraps decoder.

8 years agogeneral.texi: document libcelt decoder.
Nicolas George [Sat, 23 Apr 2011 09:42:26 +0000 (11:42 +0200)]
general.texi: document libcelt decoder.

8 years agoFix some passing argument from incompatible pointer type warnings.
Michael Niedermayer [Sun, 24 Apr 2011 15:46:50 +0000 (17:46 +0200)]
Fix some passing argument from incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: Add missing libm library dependencies to .pc files.
Reinhard Tartler [Sun, 24 Apr 2011 15:24:24 +0000 (17:24 +0200)]
configure: Add missing libm library dependencies to .pc files.

This unbreaks static compilation using pkg-config on systems in need of -lm.
Based on an mplayer2 patch by Uoti Urpala <uau@mplayer2.org>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agooggdec: reindent after 8f3eebd6
Clément Bœsch [Sun, 24 Apr 2011 13:40:57 +0000 (15:40 +0200)]
oggdec: reindent after 8f3eebd6

Signed-off-by: Diego Biurrun <diego@biurrun.de>