ffmpeg.git
7 years agodoc: move ffmpeg-devices.texi content to separated file
Stefano Sabatini [Tue, 19 Mar 2013 19:02:16 +0000 (20:02 +0100)]
doc: move ffmpeg-devices.texi content to separated file

This should simplify inclusion in monolithic tool manuals.

7 years agodoc: move ffmpeg-formats.texi content to separated file
Stefano Sabatini [Sat, 30 Mar 2013 16:02:53 +0000 (17:02 +0100)]
doc: move ffmpeg-formats.texi content to separated file

This should simplify inclusion in monolithic tool manuals.

7 years agodoc: move ffmpeg-codecs.texi content to separated file
Stefano Sabatini [Fri, 5 Apr 2013 08:05:26 +0000 (10:05 +0200)]
doc: move ffmpeg-codecs.texi content to separated file

This should simplify inclusion in monolithic tool manuals.

7 years agolavfi/blend: use standard options parsing
Paul B Mahol [Fri, 5 Apr 2013 00:12:22 +0000 (00:12 +0000)]
lavfi/blend: use standard options parsing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/noise: use standard options parsing
Paul B Mahol [Fri, 5 Apr 2013 00:06:29 +0000 (00:06 +0000)]
lavfi/noise: use standard options parsing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/afade: use standard options parsing
Paul B Mahol [Fri, 5 Apr 2013 00:01:28 +0000 (00:01 +0000)]
lavfi/afade: use standard options parsing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agortpdec: Increase max rtp packet size to 8192
Andrew Van Til [Thu, 4 Apr 2013 23:46:50 +0000 (01:46 +0200)]
rtpdec: Increase max rtp packet size to 8192

Fixes Ticket2314
Fixes connecting to "Ceton InfiniTV4 PCIe & USB"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortsp/rtp_read_header: Use RTP_MAX_PACKET_LENGTH instead of 1500
Andrew Van Til [Thu, 4 Apr 2013 23:45:52 +0000 (01:45 +0200)]
rtsp/rtp_read_header: Use RTP_MAX_PACKET_LENGTH instead of 1500

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: fix erroneously truncated comment on a scale example
Stefano Sabatini [Thu, 4 Apr 2013 22:30:54 +0000 (00:30 +0200)]
doc/filters: fix erroneously truncated comment on a scale example

7 years agodoc/filters: put separated geq variables in separate lines
Stefano Sabatini [Thu, 4 Apr 2013 22:29:28 +0000 (00:29 +0200)]
doc/filters: put separated geq variables in separate lines

Make clear that they are not aliases for the same variable.

7 years agoxbmenc: remove unused code
Paul B Mahol [Sat, 30 Mar 2013 02:54:30 +0000 (02:54 +0000)]
xbmenc: remove unused code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoxwdenc: remove unused code
Paul B Mahol [Sat, 30 Mar 2013 02:31:55 +0000 (02:31 +0000)]
xwdenc: remove unused code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agobmpenc: get rid of BMPContext as it is unused
Paul B Mahol [Sat, 30 Mar 2013 02:19:36 +0000 (02:19 +0000)]
bmpenc: get rid of BMPContext as it is unused

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/smptebars: fix invalid writes
Paul B Mahol [Thu, 4 Apr 2013 14:29:14 +0000 (14:29 +0000)]
lavfi/smptebars: fix invalid writes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc: document -v repeat
Michael Niedermayer [Sun, 31 Mar 2013 21:14:56 +0000 (23:14 +0200)]
doc: document -v repeat

Thanks-to: Derek Buitenhuis
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Thu, 4 Apr 2013 19:19:41 +0000 (21:19 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc: use packet duration for subtitles if necessary.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/opencl: replace assert by check and error message in av_opencl_init()
highgod0401 [Thu, 4 Apr 2013 12:20:47 +0000 (20:20 +0800)]
avutil/opencl: replace assert by check and error message in av_opencl_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/opencl: check strtol for failure
highgod0401 [Thu, 4 Apr 2013 12:11:51 +0000 (20:11 +0800)]
avutil/opencl: check strtol for failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/opencl: add check for the program number to create kernel
highgod0401 [Thu, 4 Apr 2013 12:09:17 +0000 (20:09 +0800)]
avutil/opencl: add check for the program number to create kernel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/blend: add N variable
Paul B Mahol [Thu, 4 Apr 2013 15:29:01 +0000 (15:29 +0000)]
lavfi/blend: add N variable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/smptebars: fix output for subsampled yuv
Paul B Mahol [Thu, 4 Apr 2013 12:55:41 +0000 (12:55 +0000)]
lavfi/smptebars: fix output for subsampled yuv

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomatroskadec: Check EBML lace sizes.
Michael Niedermayer [Thu, 4 Apr 2013 13:39:23 +0000 (15:39 +0200)]
matroskadec: Check EBML lace sizes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: Check for overflows in xiph lace decoding
Michael Niedermayer [Thu, 4 Apr 2013 13:17:57 +0000 (15:17 +0200)]
matroskadec: Check for overflows in xiph lace decoding

This also detects errors earlier

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: fix return code for too long xiph laces
Michael Niedermayer [Thu, 4 Apr 2013 13:13:53 +0000 (15:13 +0200)]
matroskadec: fix return code for too long xiph laces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodfa: remove redundant check
Michael Niedermayer [Thu, 4 Apr 2013 12:49:00 +0000 (14:49 +0200)]
dfa: remove redundant check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 4 Apr 2013 12:30:41 +0000 (14:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  xmv: do not leak memory in the error paths in xmv_read_header()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'
Michael Niedermayer [Thu, 4 Apr 2013 12:20:51 +0000 (14:20 +0200)]
Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'

* commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c':
  xmv: check audio track parameters validity.
  bmv: check for len being valid in bmv_decode_frame().

Conflicts:
libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: use packet duration for subtitles if necessary.
Nicolas George [Sun, 24 Mar 2013 14:52:28 +0000 (15:52 +0100)]
lavc: use packet duration for subtitles if necessary.

Fix trac ticket #2397.

7 years agoMerge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'
Michael Niedermayer [Thu, 4 Apr 2013 11:41:01 +0000 (13:41 +0200)]
Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'

* commit '8d617b11cfc87b2c6056fee029ac5bc760af874a':
  id3v2: pad the APIC packets as required by lavc.
  dfa: check for invalid access in decode_wdlt().

Conflicts:
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'
Michael Niedermayer [Thu, 4 Apr 2013 11:09:54 +0000 (13:09 +0200)]
Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'

* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
libavformat/utils.c

See: 44a7a6300d104dd453bcd5c601e9c6944fb34679

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
Michael Niedermayer [Thu, 4 Apr 2013 11:00:59 +0000 (13:00 +0200)]
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'

* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
  opt: check the return values of av_get_token for ENOMEM.
  doc: Fix best_nb_channells typo
  matroska: pass the lace size to the matroska_parse_rm_audio

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '8a96df7b70be509dae9ceec82d2c10a20361356d'
Michael Niedermayer [Thu, 4 Apr 2013 10:45:46 +0000 (12:45 +0200)]
Merge commit '8a96df7b70be509dae9ceec82d2c10a20361356d'

* commit '8a96df7b70be509dae9ceec82d2c10a20361356d':
  matroska: fix a corner case in ebml-lace parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fc43c19a567aa945398dccb491d972c11ec2a065'
Michael Niedermayer [Thu, 4 Apr 2013 10:38:44 +0000 (12:38 +0200)]
Merge commit 'fc43c19a567aa945398dccb491d972c11ec2a065'

* commit 'fc43c19a567aa945398dccb491d972c11ec2a065':
  matroska: Update the available size after lace parsing
  clang: use -fsantize=address and -fsanitize=thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/ffprobe: fix references in See Also section
Stefano Sabatini [Thu, 4 Apr 2013 08:13:30 +0000 (10:13 +0200)]
doc/ffprobe: fix references in See Also section

7 years agoxmv: do not leak memory in the error paths in xmv_read_header()
Anton Khirnov [Thu, 28 Mar 2013 09:34:47 +0000 (10:34 +0100)]
xmv: do not leak memory in the error paths in xmv_read_header()

CC: libav-stable@libav.org
7 years agoxmv: check audio track parameters validity.
Anton Khirnov [Thu, 28 Mar 2013 09:33:02 +0000 (10:33 +0100)]
xmv: check audio track parameters validity.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agobmv: check for len being valid in bmv_decode_frame().
Anton Khirnov [Thu, 28 Mar 2013 09:09:36 +0000 (10:09 +0100)]
bmv: check for len being valid in bmv_decode_frame().

It can be 0 or -1 for invalid files, which may result in invalid memory
access.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoid3v2: pad the APIC packets as required by lavc.
Anton Khirnov [Thu, 28 Mar 2013 08:49:38 +0000 (09:49 +0100)]
id3v2: pad the APIC packets as required by lavc.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agodfa: check for invalid access in decode_wdlt().
Anton Khirnov [Wed, 27 Mar 2013 17:18:38 +0000 (18:18 +0100)]
dfa: check for invalid access in decode_wdlt().

This can happen when the number of skipped lines is not consistent with
the number of coded lines.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agolavf: make sure stream probe data gets freed.
Anton Khirnov [Wed, 27 Mar 2013 16:56:59 +0000 (17:56 +0100)]
lavf: make sure stream probe data gets freed.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoavfiltergraph: set deprecated filter_count.
Anton Khirnov [Sat, 30 Mar 2013 21:15:48 +0000 (22:15 +0100)]
avfiltergraph: set deprecated filter_count.

7 years agoopt: check the return values of av_get_token for ENOMEM.
Anton Khirnov [Mon, 25 Feb 2013 11:32:49 +0000 (12:32 +0100)]
opt: check the return values of av_get_token for ENOMEM.

7 years agodoc: Fix best_nb_channells typo
Peter Meerwald [Wed, 3 Apr 2013 12:33:58 +0000 (14:33 +0200)]
doc: Fix best_nb_channells typo

Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agooggdec: Support byte based seeking
Michael Niedermayer [Thu, 4 Apr 2013 02:03:07 +0000 (04:03 +0200)]
oggdec: Support byte based seeking

Fixed Ticket2317

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: Add a mechanism to allow demuxers to detect byte based seeking.
Michael Niedermayer [Thu, 4 Apr 2013 02:01:12 +0000 (04:01 +0200)]
avformat: Add a mechanism to allow demuxers to detect byte based seeking.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAdd a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.
Carl Eugen Hoyos [Wed, 3 Apr 2013 21:58:20 +0000 (23:58 +0200)]
Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.

Tested-by: Nevcairiel
7 years agomatroskadec: fix display_width/height = 0 handling
Michael Niedermayer [Wed, 3 Apr 2013 21:40:13 +0000 (23:40 +0200)]
matroskadec: fix display_width/height = 0 handling

Fixes Ticket2424

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/fate.texi: fix typo
Stefano Sabatini [Wed, 3 Apr 2013 19:06:33 +0000 (21:06 +0200)]
doc/fate.texi: fix typo

7 years agodoc/filters: fix error in blend description
Paul B Mahol [Wed, 3 Apr 2013 17:06:25 +0000 (17:06 +0000)]
doc/filters: fix error in blend description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Wed, 3 Apr 2013 16:29:13 +0000 (18:29 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc: do not init frame with guessed layout.
  lavfi/af_atempo: simplify request_frame loop.
  lavfi/af_asetnsamples: simplify request_frame loop.
  lavfi/f_ebur128: remove request_frame hack.
  lavfi/vf_tile: simplify request_frame loop.
  lavfi: reindent after last commit.
  lavfi: loop on request_frame if necessary.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: do not init frame with guessed layout.
Nicolas George [Thu, 14 Mar 2013 18:15:12 +0000 (19:15 +0100)]
lavc: do not init frame with guessed layout.

It is breaking support from files with unknown layout.

7 years agolavfi/af_atempo: simplify request_frame loop.
Nicolas George [Sun, 31 Mar 2013 17:36:38 +0000 (19:36 +0200)]
lavfi/af_atempo: simplify request_frame loop.

7 years agolavfi/af_asetnsamples: simplify request_frame loop.
Nicolas George [Sun, 31 Mar 2013 17:34:35 +0000 (19:34 +0200)]
lavfi/af_asetnsamples: simplify request_frame loop.

7 years agolavfi/f_ebur128: remove request_frame hack.
Nicolas George [Sun, 31 Mar 2013 17:32:45 +0000 (19:32 +0200)]
lavfi/f_ebur128: remove request_frame hack.

7 years agolavfi/vf_tile: simplify request_frame loop.
Nicolas George [Sun, 31 Mar 2013 17:19:35 +0000 (19:19 +0200)]
lavfi/vf_tile: simplify request_frame loop.

7 years agolavfi: reindent after last commit.
Nicolas George [Wed, 3 Apr 2013 15:43:53 +0000 (17:43 +0200)]
lavfi: reindent after last commit.

7 years agolavfi: loop on request_frame if necessary.
Nicolas George [Sun, 31 Mar 2013 17:17:57 +0000 (19:17 +0200)]
lavfi: loop on request_frame if necessary.

Some filters need several input frames before producing output.
For these filter, it becomes simpler to return 0 in
request_frame() and let the framework call it again until
output has been produced.

7 years agoSkip padding in an id3 tag in aiff files.
Carl Eugen Hoyos [Wed, 3 Apr 2013 13:45:46 +0000 (15:45 +0200)]
Skip padding in an id3 tag in aiff files.

Fixes ticket #2430.

Reviewed-by: Matthieu Bouron
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 3 Apr 2013 13:35:16 +0000 (15:35 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix make checkheaders without opencl headers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix make checkheaders without opencl headers.
Carl Eugen Hoyos [Wed, 3 Apr 2013 13:28:29 +0000 (15:28 +0200)]
Fix make checkheaders without opencl headers.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 3 Apr 2013 13:20:05 +0000 (15:20 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '817dff578f13ce97576c609ab141508b9dc782e9'
Michael Niedermayer [Wed, 3 Apr 2013 13:08:21 +0000 (15:08 +0200)]
Merge commit '817dff578f13ce97576c609ab141508b9dc782e9'

* commit '817dff578f13ce97576c609ab141508b9dc782e9':
  configure: Check for the atomic.h functions used in the suncc atomics header

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmacker: fix off by one error
Paul B Mahol [Wed, 3 Apr 2013 12:57:58 +0000 (12:57 +0000)]
smacker: fix off by one error

Regression since a93b572ae4f517ce0c35cf085167c318e9215908.

Fixes #2426.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'
Michael Niedermayer [Wed, 3 Apr 2013 12:46:48 +0000 (14:46 +0200)]
Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'

* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
  configure: prettify atomics handling.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/afade * biquads: call av_frame_copy_props()
Paul B Mahol [Wed, 3 Apr 2013 11:10:00 +0000 (11:10 +0000)]
lavfi/afade * biquads: call av_frame_copy_props()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/earwax: clip sample, this is what sox does
Paul B Mahol [Wed, 3 Apr 2013 10:52:01 +0000 (10:52 +0000)]
lavfi/earwax: clip sample, this is what sox does

Fixes #1884.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovf_deshake: Reorder constant arguments in an if() statement.
Carl Eugen Hoyos [Wed, 3 Apr 2013 10:52:38 +0000 (12:52 +0200)]
vf_deshake: Reorder constant arguments in an if() statement.

Fixes compilation with clang on netbsd with --disable-optimizations.

Tested-by: Paul B Mahol
7 years agomatroska: pass the lace size to the matroska_parse_rm_audio
Luca Barbato [Fri, 29 Mar 2013 11:51:51 +0000 (12:51 +0100)]
matroska: pass the lace size to the matroska_parse_rm_audio

Each lace must be independent according to the specification.

Fix heap-buffer-overflow in matroska_parse_block for
corrupted real media in mkv files.

Stricter check than fc43c19a567aa945398dccb491d972c11ec2a065

CC: libav-stable@libav.org
7 years agomatroska: fix a corner case in ebml-lace parsing
Luca Barbato [Thu, 28 Mar 2013 10:52:52 +0000 (11:52 +0100)]
matroska: fix a corner case in ebml-lace parsing

Make sure we notice when the lace_size[n] is a negative value.

CC: libav-stable@libav.org
7 years agomatroska: Update the available size after lace parsing
Dale Curtis [Wed, 27 Mar 2013 21:02:03 +0000 (14:02 -0700)]
matroska: Update the available size after lace parsing

Fix heap-buffer-overflow in matroska_parse_block for
corrupted real media in mkv files.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoclang: use -fsantize=address and -fsanitize=thread
Luca Barbato [Thu, 28 Mar 2013 02:30:53 +0000 (03:30 +0100)]
clang: use -fsantize=address and -fsanitize=thread

The previous syntax is deprecated.

7 years agoaphaser filter
Paul B Mahol [Sat, 30 Mar 2013 04:03:39 +0000 (04:03 +0000)]
aphaser filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavfiltergraph: check for sws opts being non-NULL before using them.
Anton Khirnov [Sun, 17 Mar 2013 15:14:58 +0000 (16:14 +0100)]
avfiltergraph: check for sws opts being non-NULL before using them.

Avoid snprintfing a NULL pointer.

CC: libav-stable@libav.org
7 years agoconfigure: Check for the atomic.h functions used in the suncc atomics header
Martin Storsjö [Thu, 28 Mar 2013 09:48:39 +0000 (10:48 +0100)]
configure: Check for the atomic.h functions used in the suncc atomics header

The "suncc" atomics implementation uses a suncc specific memory
barrier, but also relies on a few atomic functions from atomic.h,
that are not suncc specific but specific to solaris. This made
the current implementation fail on suncc on linux.

7 years agoconfigure: prettify atomics handling.
Anton Khirnov [Wed, 27 Mar 2013 18:26:19 +0000 (19:26 +0100)]
configure: prettify atomics handling.

Add simpler names and a shorthand for native atomics (as opposed to
pthreads fallback).

7 years agoflvdec: fix seeking in audio only files
Michael Niedermayer [Wed, 3 Apr 2013 01:57:37 +0000 (03:57 +0200)]
flvdec: fix seeking in audio only files

Fixes Seeking with the file in Ticket2283

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264pred: fix "warning: initialization discards const qualifier from pointer target...
Michael Niedermayer [Wed, 3 Apr 2013 01:12:27 +0000 (03:12 +0200)]
h264pred: fix "warning: initialization discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/edgedetect: reindent after previous commit.
Clément Bœsch [Tue, 2 Apr 2013 22:31:19 +0000 (00:31 +0200)]
lavfi/edgedetect: reindent after previous commit.

7 years agolavfi/edgedetect: add direct path.
Clément Bœsch [Tue, 2 Apr 2013 22:21:11 +0000 (00:21 +0200)]
lavfi/edgedetect: add direct path.

7 years agoavformat: fix atomatic format selection for (s)segment
Michael Niedermayer [Tue, 2 Apr 2013 19:48:25 +0000 (21:48 +0200)]
avformat: fix atomatic format selection for (s)segment

Fixes Ticket2236

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Fix forcing of the framerate for stream copy on input
Michael Niedermayer [Tue, 2 Apr 2013 16:08:12 +0000 (18:08 +0200)]
ffmpeg: Fix forcing of the framerate for stream copy on input

Fixes Ticket2211

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodeshake opencl based on comments on 20130402 3rd
highgod0401 [Tue, 2 Apr 2013 12:54:22 +0000 (20:54 +0800)]
deshake opencl based on comments on 20130402 3rd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil: Fix "warning: initialization discards const qualifier from pointer target...
Michael Niedermayer [Tue, 2 Apr 2013 12:51:34 +0000 (14:51 +0200)]
dsputil: Fix "warning: initialization discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibmp3lame: allow joint stereo to be disabled
Paul B Mahol [Sat, 30 Mar 2013 22:15:50 +0000 (22:15 +0000)]
libmp3lame: allow joint stereo to be disabled

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agocavs: fix "warning: initialization discards const qualifier from pointer target type"
Michael Niedermayer [Tue, 2 Apr 2013 03:12:10 +0000 (05:12 +0200)]
cavs: fix "warning: initialization discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: use seek per time for ogg by default
Michael Niedermayer [Sun, 31 Mar 2013 19:38:29 +0000 (21:38 +0200)]
ffplay: use seek per time for ogg by default

Fixes Ticket2383

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/opencl: use consistent inclusion header guard name
Stefano Sabatini [Mon, 1 Apr 2013 12:02:47 +0000 (14:02 +0200)]
lavu/opencl: use consistent inclusion header guard name

7 years agolavu/opencl: apply misc cosmetics fixes
Stefano Sabatini [Mon, 1 Apr 2013 11:53:24 +0000 (13:53 +0200)]
lavu/opencl: apply misc cosmetics fixes

Split long lines, reindent code, add missing spaces between operators,
remove possibly confusing comment from av_opencl_buffer_read_image()
doxy, and use designated initializers for openclutils_class.

7 years agocavsdsp: fix "warning: initialization discards const qualifier from pointer target...
Michael Niedermayer [Mon, 1 Apr 2013 18:47:14 +0000 (20:47 +0200)]
cavsdsp: fix "warning: initialization discards const qualifier from pointer target type"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: initialize got_output, this silences a compiler warning from icc
Michael Niedermayer [Mon, 1 Apr 2013 18:40:09 +0000 (20:40 +0200)]
ffmpeg: initialize got_output, this silences a compiler warning from icc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/curves: make use of options to store the preset names.
Clément Bœsch [Mon, 1 Apr 2013 18:37:45 +0000 (20:37 +0200)]
lavfi/curves: make use of options to store the preset names.

7 years agocmdutils: fix build with --disable-avfilter.
Clément Bœsch [Mon, 1 Apr 2013 17:56:59 +0000 (19:56 +0200)]
cmdutils: fix build with --disable-avfilter.

7 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Mon, 1 Apr 2013 13:13:02 +0000 (15:13 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/af_asetnsamples: fix EOF handling.
  lavu/opt: make sure av_opt_set_bin() handles NULL/0.
  lavd/v4l2: fully init an ioctl argument.
  lavfi: detect merge failure for unknown layouts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoChangelog: add entry for OpenCL
Michael Niedermayer [Mon, 1 Apr 2013 11:32:34 +0000 (13:32 +0200)]
Changelog: add entry for OpenCL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoopencl: fix double ;
Michael Niedermayer [Mon, 1 Apr 2013 11:01:17 +0000 (13:01 +0200)]
opencl: fix double ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoopencl wrapper based on comments on 20130401
highgod0401 [Mon, 1 Apr 2013 09:46:11 +0000 (17:46 +0800)]
opencl wrapper based on comments on 20130401

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 1 Apr 2013 10:29:44 +0000 (12:29 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oma: Validate sample rates

Conflicts:
libavformat/oma.c

See: a30165c4a8044e1d5527c1302b5a5cb473e0913d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/af_asetnsamples: fix EOF handling.
Nicolas George [Sun, 31 Mar 2013 17:28:11 +0000 (19:28 +0200)]
lavfi/af_asetnsamples: fix EOF handling.

Only filter one buffered frame.
Correctly return EOF if there is none.

7 years agolavu/opt: make sure av_opt_set_bin() handles NULL/0.
Nicolas George [Thu, 28 Mar 2013 15:45:12 +0000 (16:45 +0100)]
lavu/opt: make sure av_opt_set_bin() handles NULL/0.

7 years agolavd/v4l2: fully init an ioctl argument.
Nicolas George [Wed, 27 Mar 2013 10:11:31 +0000 (11:11 +0100)]
lavd/v4l2: fully init an ioctl argument.

Silence a valgrind warning about uninitialized memory.