OSDN Git Service

android-x86/external-ffmpeg.git
11 years agosws: Fix "warning: comparison of distinct pointer types lacks a cast"
Michael Niedermayer [Sun, 3 Feb 2013 19:36:58 +0000 (20:36 +0100)]
sws: Fix "warning: comparison of distinct pointer types lacks a cast"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovc1dec: Fix 2 "warning: may be used uninitialized in this function"
Michael Niedermayer [Mon, 4 Feb 2013 13:30:40 +0000 (14:30 +0100)]
vc1dec: Fix 2 "warning: may be used uninitialized in this function"

Initialize pointers to NULL for safety

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'mjbshaw/master'
Michael Niedermayer [Mon, 4 Feb 2013 12:22:49 +0000 (13:22 +0100)]
Merge remote-tracking branch 'mjbshaw/master'

* mjbshaw/master:
  libopenjpegenc: make dci compliant j2c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 4 Feb 2013 11:36:39 +0000 (12:36 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: simplify REBASE_PICTURE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolibopenjpegenc: make dci compliant j2c
Michaël Cinquin [Mon, 4 Feb 2013 06:53:39 +0000 (23:53 -0700)]
libopenjpegenc: make dci compliant j2c

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
11 years agompegvideo: simplify REBASE_PICTURE
Anton Khirnov [Thu, 31 Jan 2013 19:24:06 +0000 (20:24 +0100)]
mpegvideo: simplify REBASE_PICTURE

Always evaluate to NULL when the source Picture is not located in the
MpegEncContext.picture array. That will only happen for
next/last_picture_ptr when updating the thread context during h264 frame
threaded decoding, where they will point to elements of ref_list. Since
ref_list is not copied during updating the context and is invalid until
it is constructed for the current slice, there is no point in doing
anything complicated with next/last_picture_ptr, as they will get
updated when the ref_list is filled.

11 years agoswr: Dont use floats for S32->S32 when possible
Michael Niedermayer [Mon, 4 Feb 2013 01:36:33 +0000 (02:36 +0100)]
swr: Dont use floats for S32->S32 when possible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoswr: reorder init code to make rematrix status available earlier
Michael Niedermayer [Mon, 4 Feb 2013 03:00:12 +0000 (04:00 +0100)]
swr: reorder init code to make rematrix status available earlier

This also makes some other fields available earlier which may
be usefull one day

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoswr-test: Fix clip to 32bit
Michael Niedermayer [Mon, 4 Feb 2013 02:55:56 +0000 (03:55 +0100)]
swr-test: Fix clip to 32bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoswr/resample: fix integer overflow, add missing cast
Michael Niedermayer [Mon, 4 Feb 2013 02:53:10 +0000 (03:53 +0100)]
swr/resample: fix integer overflow, add missing cast

The effects of this are limited to numeric errors in the output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoswr/resample: fix filter rounding and cliping for s32
Michael Niedermayer [Mon, 4 Feb 2013 02:25:07 +0000 (03:25 +0100)]
swr/resample: fix filter rounding and cliping for s32

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/filters: reformat various filter tables items
Stefano Sabatini [Sun, 3 Feb 2013 22:16:20 +0000 (23:16 +0100)]
doc/filters: reformat various filter tables items

Improve overall consistency.

11 years agolavu/parseutils: add digital cinema frame sizes
Dave Rice [Sun, 3 Feb 2013 21:57:04 +0000 (22:57 +0100)]
lavu/parseutils: add digital cinema frame sizes

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years agoqdm2: disable superblocktype_2_3==0 code
Michael Niedermayer [Sun, 30 Dec 2012 02:18:46 +0000 (03:18 +0100)]
qdm2: disable superblocktype_2_3==0 code

The code is untested and contained bugs, we need a sample if any files
use this branch.

Suggested-by: Roberto Togni
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoqdm2: Fix data type used in multiplication.
Michael Niedermayer [Sun, 30 Dec 2012 02:13:30 +0000 (03:13 +0100)]
qdm2: Fix data type used in multiplication.

Avoid unintended truncation.
Fixes CID700555

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavfi/showspectrum: set default height to 512
Rudolf Polzer [Sun, 3 Feb 2013 17:03:39 +0000 (17:03 +0000)]
lavfi/showspectrum: set default height to 512

Only power-of-two FFTs are supported; so to get a full spectrum
(that is, one up to Nyquist), the height must be a power of two.

Therefore, change the default height from 480 to 512.

Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
11 years agoput_vp_no_rnd_pixels8_l2_mmx: fix type
Michael Niedermayer [Sun, 3 Feb 2013 16:20:39 +0000 (17:20 +0100)]
put_vp_no_rnd_pixels8_l2_mmx: fix type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/syntax: add missing frame sizes
Dave Rice [Sat, 2 Feb 2013 02:11:34 +0000 (21:11 -0500)]
doc/syntax: add missing frame sizes

Adding missing frame sizes used in parseutils.c to the documentation.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years agodoc/syntax: fix frame rate documentation
Dave Rice [Sat, 2 Feb 2013 02:07:59 +0000 (21:07 -0500)]
doc/syntax: fix frame rate documentation

This patch corrects a mistake in the documentation and aligns the
documentation of frame rates to the values that exist in parseutils.c.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years agolavfi/pad: add support to named options
Stefano Sabatini [Fri, 1 Feb 2013 23:51:14 +0000 (00:51 +0100)]
lavfi/pad: add support to named options

11 years agoffplay: remove misleading comment from audio_decode_frame()
Stefano Sabatini [Sun, 3 Feb 2013 11:30:44 +0000 (12:30 +0100)]
ffplay: remove misleading comment from audio_decode_frame()

11 years agoffplay: rename audio_decode_frame() variable "pts" to "audio_clock0"
Stefano Sabatini [Sun, 3 Feb 2013 11:29:46 +0000 (12:29 +0100)]
ffplay: rename audio_decode_frame() variable "pts" to "audio_clock0"

The new name better expresses what the variable is.

11 years agoffplay: remove pts_ptr argument from audio_decode_frame()
Stefano Sabatini [Sat, 2 Feb 2013 15:09:24 +0000 (16:09 +0100)]
ffplay: remove pts_ptr argument from audio_decode_frame()

The argument is no longer used outside the function. Simplify.

11 years agoavcodec/x86: Add daniels copyright to the recent gcc->yasm convertions he did.
Michael Niedermayer [Sun, 3 Feb 2013 12:50:44 +0000 (13:50 +0100)]
avcodec/x86: Add daniels copyright to the recent gcc->yasm convertions he did.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agobuild: Remove superfluous MAKE variable for the build suffix
James Almer [Sun, 3 Feb 2013 02:32:56 +0000 (23:32 -0300)]
build: Remove superfluous MAKE variable for the build suffix

Use BUILDSUF instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoproresdsp: Fix checkheaders
James Almer [Sun, 3 Feb 2013 09:01:35 +0000 (06:01 -0300)]
proresdsp: Fix checkheaders

It's been broken since commit ac89875

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tag
Carl Eugen Hoyos [Sun, 3 Feb 2013 10:12:49 +0000 (11:12 +0100)]
lavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tag

Replace wrong "EXT-X-ALLOWCACHE" with "EXT-X-ALLOW-CACHE", and value 1/0
with YES/NO, as per spec.

Fix trac ticket #2228.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years agoffplay: drop redundant NULL sws_freeContext() check in stream_close()
Stefano Sabatini [Sat, 2 Feb 2013 15:31:57 +0000 (16:31 +0100)]
ffplay: drop redundant NULL sws_freeContext() check in stream_close()

sws_freeContext() already checks for NULL, simplify.

11 years agoffmpeg: free attachments, fix memleak
Michael Niedermayer [Sun, 3 Feb 2013 01:45:41 +0000 (02:45 +0100)]
ffmpeg: free attachments, fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoRequire at least three frames to autodetect loas.
Carl Eugen Hoyos [Sat, 2 Feb 2013 21:36:25 +0000 (22:36 +0100)]
Require at least three frames to autodetect loas.

11 years agoh264: skip error concealment when SPS and slices are mismatching
Michael Niedermayer [Sat, 2 Feb 2013 20:11:54 +0000 (21:11 +0100)]
h264: skip error concealment when SPS and slices are mismatching

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoflacdec: skip in stream header packets
Michael Niedermayer [Sat, 2 Feb 2013 18:17:25 +0000 (19:17 +0100)]
flacdec: skip in stream header packets

This prevents warning messages on chained oggs with some demuxers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc: update filter_design.txt to API changes.
Nicolas George [Thu, 29 Nov 2012 16:40:42 +0000 (17:40 +0100)]
doc: update filter_design.txt to API changes.

11 years agoh264: silence warning about array index being out of bounds
Michael Niedermayer [Sat, 2 Feb 2013 15:20:19 +0000 (16:20 +0100)]
h264: silence warning about array index being out of bounds

The index is not out of bounds, adding an assert makes gcc
realize this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 2 Feb 2013 15:14:15 +0000 (16:14 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: step to next frame if paused when seeking
  ffplay: move up pause functions
  ffplay: remember last window dimensions
  ffplay: fix order of setting show_mode
  ffplay: dynamically allocate audio buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/indevs: add missing final dot in v4l2 option value description
Stefano Sabatini [Fri, 1 Feb 2013 23:54:40 +0000 (00:54 +0100)]
doc/indevs: add missing final dot in v4l2 option value description

Fix inconsistency.

11 years agolavfi/crop: fix help message for the keep_aspect option
Stefano Sabatini [Fri, 1 Feb 2013 23:41:24 +0000 (00:41 +0100)]
lavfi/crop: fix help message for the keep_aspect option

11 years agoffplay: extend doxy for audio_decode_frame()
Stefano Sabatini [Thu, 28 Jun 2012 21:46:20 +0000 (23:46 +0200)]
ffplay: extend doxy for audio_decode_frame()

11 years agolavd/alsa: simplify reordering functions definition.
Nicolas George [Sat, 2 Feb 2013 13:13:11 +0000 (14:13 +0100)]
lavd/alsa: simplify reordering functions definition.

11 years agoavfilter/vf_hqdn3d.h: restore author attribution, history and project name
Michael Niedermayer [Sat, 2 Feb 2013 11:44:26 +0000 (12:44 +0100)]
avfilter/vf_hqdn3d.h: restore author attribution, history and project name

See git blame of pre split avfilter/vf_hqdn3d.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoavfilter/x86/vf_hqdn3d_init: fix author attribution & project name
Michael Niedermayer [Sat, 2 Feb 2013 11:38:44 +0000 (12:38 +0100)]
avfilter/x86/vf_hqdn3d_init: fix author attribution & project name

Reference: 7a1944b907179212e7073b821fdc60e27d536e4a

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 2 Feb 2013 12:01:45 +0000 (13:01 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_hqdn3d: x86: Add proper arch optimization initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffplay: step to next frame if paused when seeking
Marton Balint [Sat, 19 Jan 2013 00:57:50 +0000 (01:57 +0100)]
ffplay: step to next frame if paused when seeking

Signed-off-by: Marton Balint <cus@passwd.hu>
11 years agoffplay: move up pause functions
Marton Balint [Sat, 19 Jan 2013 00:44:38 +0000 (01:44 +0100)]
ffplay: move up pause functions

No change in functionality.

Signed-off-by: Marton Balint <cus@passwd.hu>
11 years agoffplay: remember last window dimensions
Marton Balint [Sun, 27 Jan 2013 13:03:15 +0000 (14:03 +0100)]
ffplay: remember last window dimensions

After this change the dimensions of single image videos will be remembered when
coming back from full screen. The issue was mentioned in ticket #2174.

Signed-off-by: Marton Balint <cus@passwd.hu>
11 years agoffplay: fix order of setting show_mode
Marton Balint [Sat, 26 Jan 2013 23:45:47 +0000 (00:45 +0100)]
ffplay: fix order of setting show_mode

Without the fix the refresh event may have got called with unset show mode.

Fixes ticket #2174.

Signed-off-by: Marton Balint <cus@passwd.hu>
11 years agoffplay: dynamically allocate audio buffer
Marton Balint [Sat, 26 Jan 2013 21:32:39 +0000 (22:32 +0100)]
ffplay: dynamically allocate audio buffer

We simply remove the fixed length VideoState->audio_buf2 and use
the previously unused VideoState->audio_buf1.

Fixes ticket #2191.

Signed-off-by: Marton Balint <cus@passwd.hu>
11 years agoMap the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order.
Carl Eugen Hoyos [Sat, 2 Feb 2013 11:29:58 +0000 (12:29 +0100)]
Map the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order.

Fixes a part of ticket #2190.

11 years agobuild-sys: Fix pkgconfig files when ffmpeg is built with --build-suffix
Steven Boswell II [Sat, 26 Jan 2013 21:08:47 +0000 (13:08 -0800)]
build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffix

Tested-on: Fedora Core 14, 16, and 17.
Tested-on: Ubuntu by commiter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoDo not fail for mixed interlaced / non-interlaced YUV4MPEG streams.
Carl Eugen Hoyos [Fri, 1 Feb 2013 22:55:54 +0000 (23:55 +0100)]
Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams.

11 years agovp56: remove clear_blocks call, and clear alpha plane U/V DC only.
Ronald S. Bultje [Fri, 1 Feb 2013 19:04:50 +0000 (11:04 -0800)]
vp56: remove clear_blocks call, and clear alpha plane U/V DC only.

The non-alpha and alpha-Y planes are cleared in the idct_put/add()
calls. For the alpha U/V planes, we only care about the DC for entropy
context prediction purposes, the rest of the data is unused.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoDo not change codec in flv streams if the user has forced a codec.
Carl Eugen Hoyos [Fri, 1 Feb 2013 22:27:15 +0000 (23:27 +0100)]
Do not change codec in flv streams if the user has forced a codec.

Fixes ticket #2218.

11 years agoffmpeg: fix broken channel_layout option
Matthieu Bouron [Fri, 1 Feb 2013 17:58:14 +0000 (18:58 +0100)]
ffmpeg: fix broken channel_layout option

Fixes ticket #2163.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/filters: fix syntax and typo for the afade curve option
Stefano Sabatini [Fri, 1 Feb 2013 17:52:42 +0000 (18:52 +0100)]
doc/filters: fix syntax and typo for the afade curve option

11 years agodoc/filters: create a dedicated examples section for lut*, and itemize
Stefano Sabatini [Fri, 1 Feb 2013 17:35:15 +0000 (18:35 +0100)]
doc/filters: create a dedicated examples section for lut*, and itemize

11 years agodoc/filters: fix syntax and description for the lut* options
Stefano Sabatini [Fri, 1 Feb 2013 17:32:21 +0000 (18:32 +0100)]
doc/filters: fix syntax and description for the lut* options

11 years agodoc/muxers: fix level for the segment options subsection
Stefano Sabatini [Fri, 1 Feb 2013 17:12:54 +0000 (18:12 +0100)]
doc/muxers: fix level for the segment options subsection

Properly declare it like a @subsection, rather than as a @section.

11 years agodoc/muxers.texi: Fix mp3 picture attachment documentation.
Carl Eugen Hoyos [Fri, 1 Feb 2013 16:54:48 +0000 (17:54 +0100)]
doc/muxers.texi: Fix mp3 picture attachment documentation.

11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 1 Feb 2013 13:34:18 +0000 (14:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Use proper "" quotes for local header #includes
  ppc: fmtconvert: Drop two unused variables.
  bink demuxer: set framerate.

Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '1730ca2eca42974af0c29f38a0770997cba2f0da'
Michael Niedermayer [Fri, 1 Feb 2013 13:24:46 +0000 (14:24 +0100)]
Merge commit '1730ca2eca42974af0c29f38a0770997cba2f0da'

* commit '1730ca2eca42974af0c29f38a0770997cba2f0da':
  bink demuxer: check malloc return value

See:
commit e400b95b3205d5b861346f525cf6f423d93d2f04
Author: Paul B Mahol <onemda@gmail.com>
Date:   Sat Jun 9 10:57:14 2012 +0000

    bink: check av_mallocz() return value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'
Michael Niedermayer [Fri, 1 Feb 2013 12:59:00 +0000 (13:59 +0100)]
Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
  bink: fix a check for the first frame.
  doc/developer: Drop obsolete MPlayer reference
  doc/developer: Add ISC license to list of acceptable licenses
  doc/developer: Add web links for all suggested licenses

Conflicts:
doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agovf_hqdn3d: x86: Add proper arch optimization initialization
Diego Biurrun [Tue, 22 Jan 2013 00:39:37 +0000 (01:39 +0100)]
vf_hqdn3d: x86: Add proper arch optimization initialization

11 years agoUse proper "" quotes for local header #includes
Diego Biurrun [Fri, 1 Feb 2013 09:27:45 +0000 (10:27 +0100)]
Use proper "" quotes for local header #includes

11 years agoppc: fmtconvert: Drop two unused variables.
Diego Biurrun [Fri, 1 Feb 2013 00:54:19 +0000 (01:54 +0100)]
ppc: fmtconvert: Drop two unused variables.

11 years agobink demuxer: set framerate.
Anton Khirnov [Thu, 31 Jan 2013 20:07:34 +0000 (21:07 +0100)]
bink demuxer: set framerate.

11 years agobink demuxer: check malloc return value
Anton Khirnov [Thu, 31 Jan 2013 20:02:06 +0000 (21:02 +0100)]
bink demuxer: check malloc return value

11 years agobink: fix a check for the first frame.
Anton Khirnov [Thu, 31 Jan 2013 19:58:27 +0000 (20:58 +0100)]
bink: fix a check for the first frame.

Packet pts is a very unreliable indicator, use
AVCodecContext.frame_number instead.

11 years agodoc/developer: Drop obsolete MPlayer reference
Diego Biurrun [Thu, 31 Jan 2013 18:47:22 +0000 (19:47 +0100)]
doc/developer: Drop obsolete MPlayer reference

11 years agodoc/developer: Add ISC license to list of acceptable licenses
Diego Biurrun [Thu, 31 Jan 2013 18:37:08 +0000 (19:37 +0100)]
doc/developer: Add ISC license to list of acceptable licenses

11 years agodoc/developer: Add web links for all suggested licenses
Diego Biurrun [Thu, 31 Jan 2013 18:34:37 +0000 (19:34 +0100)]
doc/developer: Add web links for all suggested licenses

11 years agodict: fix memleak
Michael Niedermayer [Fri, 1 Feb 2013 02:56:51 +0000 (03:56 +0100)]
dict: fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'mjbshaw/master'
Michael Niedermayer [Fri, 1 Feb 2013 01:33:37 +0000 (02:33 +0100)]
Merge remote-tracking branch 'mjbshaw/master'

* mjbshaw/master:
  libopenjpegenc: simplify switch statement
  libopenjpegenc: add support for pix fmt gbrp (8-16 bit)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomatroska: fixed missing S_DVBSUB subtitles
Allan Kristensen [Fri, 21 Dec 2012 20:04:18 +0000 (21:04 +0100)]
matroska: fixed missing S_DVBSUB subtitles

11 years agovc1dec: fieldtx is only valid for interlaced frames
Sebastian Sandberg [Thu, 31 Jan 2013 17:04:21 +0000 (18:04 +0100)]
vc1dec: fieldtx is only valid for interlaced frames

the fieldtx_plane is not cleared for interlaced fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolibopenjpegenc: simplify switch statement
Michael Bradshaw [Thu, 31 Jan 2013 23:03:58 +0000 (16:03 -0700)]
libopenjpegenc: simplify switch statement

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
11 years agolibopenjpegenc: add support for pix fmt gbrp (8-16 bit)
Michael Bradshaw [Thu, 31 Jan 2013 14:24:11 +0000 (07:24 -0700)]
libopenjpegenc: add support for pix fmt gbrp (8-16 bit)

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
11 years agovc1dec: fix block_off
Michael Niedermayer [Thu, 31 Jan 2013 22:20:15 +0000 (23:20 +0100)]
vc1dec: fix block_off

Fixes corruption of motion_val

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/indevs: document v4l2 options
Stefano Sabatini [Thu, 31 Jan 2013 15:38:06 +0000 (16:38 +0100)]
doc/indevs: document v4l2 options

Reviewed-By: Giorgio Vazzana <mywing81@gmail.com>
11 years agodoc/indevs: itemize examples for the v4l2 device
Stefano Sabatini [Thu, 31 Jan 2013 15:21:47 +0000 (16:21 +0100)]
doc/indevs: itemize examples for the v4l2 device

11 years agolavfi/buffersrc: forward filter_frame errors.
Nicolas George [Thu, 31 Jan 2013 13:49:43 +0000 (14:49 +0100)]
lavfi/buffersrc: forward filter_frame errors.

Note: The ret variable was unused.

11 years agolavfi/af_amerge: set outbuf->audio->channels.
Nicolas George [Thu, 31 Jan 2013 13:26:15 +0000 (14:26 +0100)]
lavfi/af_amerge: set outbuf->audio->channels.

The value is lost because of avfilter_copy_buffer_ref_props().

Fix trac ticket #2217.

11 years agolavfi/af_amerge: check for buffer queue overflows.
Nicolas George [Thu, 31 Jan 2013 13:24:57 +0000 (14:24 +0100)]
lavfi/af_amerge: check for buffer queue overflows.

Without that test, ff_bufqueue_add silently discards the
oldest buffer, that leaves in[i].nb_samples inconsistent,
and causes later a segfault.

11 years agolavfi/bufferqueue: add ff_bufqueue_is_full().
Nicolas George [Thu, 31 Jan 2013 13:24:08 +0000 (14:24 +0100)]
lavfi/bufferqueue: add ff_bufqueue_is_full().

11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 31 Jan 2013 19:03:29 +0000 (20:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
  configure: Add a comment indicating why uclibc is checked before glibc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'
Michael Niedermayer [Thu, 31 Jan 2013 18:52:58 +0000 (19:52 +0100)]
Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'

* commit '29f1fa74225e9fdbab6d590857edbecb51cf74da':
  configure: Move newlib libc check before mingw libc check
  avisynth: Change demuxer name to avoid conflicts with AVS

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'a65f965c04bfa27adedc0409c14cc05903f483d0'
Michael Niedermayer [Thu, 31 Jan 2013 18:19:29 +0000 (19:19 +0100)]
Merge commit 'a65f965c04bfa27adedc0409c14cc05903f483d0'

* commit 'a65f965c04bfa27adedc0409c14cc05903f483d0':
  mpegvideo: Do REBASE_PICTURE with byte pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'a5ba798c16d0614d982a76755fdd72b37d437170'
Michael Niedermayer [Thu, 31 Jan 2013 18:00:20 +0000 (19:00 +0100)]
Merge commit 'a5ba798c16d0614d982a76755fdd72b37d437170'

* commit 'a5ba798c16d0614d982a76755fdd72b37d437170':
  dsputil: remove unused functions copy_block{2, 4, 8, 16}.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoCREDITS: redirect to Git log, remove current outdated content
Stefano Sabatini [Sat, 19 Jan 2013 00:34:27 +0000 (01:34 +0100)]
CREDITS: redirect to Git log, remove current outdated content

All the removed names are already mentioned in the commit log, or are
listed as copyright holders in the contributed files.

Amongst the removed names, the following ones were not listed in the
commit log:

Mario Brito (Xan DPCM decoder)
Brian Foley (DSP utils optimizations)
Vladimir Gneushev (lavf/lavc)
Juan J. Sierralta (H.263)
Ewald Snel (qdm2, cinepak)
Lionel Ulmer (DSP utils optimizations)

11 years agodoc/filters: fix afade cuve types listing
Paul B Mahol [Thu, 31 Jan 2013 16:18:50 +0000 (16:18 +0000)]
doc/filters: fix afade cuve types listing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agolavfi: increment max number of registered filters from 128 to 256
Stefano Sabatini [Thu, 31 Jan 2013 15:47:37 +0000 (16:47 +0100)]
lavfi: increment max number of registered filters from 128 to 256

The total number of implemented filters is already over 128.

11 years agodoc/indevs: apply misc fixes to the v4l2 documentation
Stefano Sabatini [Thu, 31 Jan 2013 11:53:50 +0000 (12:53 +0100)]
doc/indevs: apply misc fixes to the v4l2 documentation

Reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
11 years agolavd/v4l2: read the correct time per frame from devices that support a standard
Giorgio Vazzana [Wed, 30 Jan 2013 14:08:04 +0000 (15:08 +0100)]
lavd/v4l2: read the correct time per frame from devices that support a standard

Generally speaking, there are two types of v4l2 devices [1]:

1) devices that support a standard, like PAL or NTFS (tv cards, for example). For
this class of devices the framerate is fixed by the standard (for example PAL uses
25 fps) and the v4l2 driver cannot usually negotiate a different framerate (unless
it can skip frames on the driver side, to save I/O bandwidth).

2) devices for which the notion of standard does not make sense (webcams, for example).
For these devices it is usually possibile to request a desidered framerate.

In either case, the desidered frame rate can be requested when the VIDIOC_G_PARM
ioctl returns the V4L2_CAP_TIMEPERFRAME flag in the capability field.

Currently the code does not check for V4L2_CAP_TIMEPERFRAME and supports only the
second category of devices, returning a time per frame of 0/0 for devices in the
first group that do not permit to negotiate the framerate.

This patch adds support to read the correct framerate in all cases.

[1] http://linuxtv.org/downloads/v4l-dvb-apis/standard.html

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years agolavfi/biquads: remove pointless casts
Paul B Mahol [Thu, 31 Jan 2013 13:16:32 +0000 (13:16 +0000)]
lavfi/biquads: remove pointless casts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agoPort biquads filters from SoX
Paul B Mahol [Thu, 24 Jan 2013 17:20:05 +0000 (17:20 +0000)]
Port biquads filters from SoX

Adds allpass, bass, bandpass, bandreject, biquad,
equalizer, highpass, lowpass and treble filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agolavd/v4l2: add list_standards option
Giorgio Vazzana [Wed, 30 Jan 2013 12:17:02 +0000 (13:17 +0100)]
lavd/v4l2: add list_standards option

Since the user is expected to choose the standard by name (with -standard
option), add the possibility to list all the supported standards.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years agodoc/eval: sort functions by name
Stefano Sabatini [Sat, 26 Jan 2013 14:25:39 +0000 (15:25 +0100)]
doc/eval: sort functions by name

11 years agodoc/eval: fix/extend documentation for taylor() function
Stefano Sabatini [Tue, 22 Jan 2013 22:53:39 +0000 (23:53 +0100)]
doc/eval: fix/extend documentation for taylor() function

11 years agodoc/eval: fix/extend documentation for root() function
Stefano Sabatini [Wed, 23 Jan 2013 10:45:31 +0000 (11:45 +0100)]
doc/eval: fix/extend documentation for root() function

11 years agox86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
Diego Biurrun [Tue, 29 Jan 2013 18:28:07 +0000 (19:28 +0100)]
x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp

11 years agoconfigure: Move newlib libc check before mingw libc check
Diego Biurrun [Wed, 30 Jan 2013 23:43:18 +0000 (00:43 +0100)]
configure: Move newlib libc check before mingw libc check

On Cygwin systems MinGW headers can be present if the corresponding
packages have been installed. Since the MinGW libc is checked for
first, this results in newlib getting misdetected as MinGW libc.