ffmpeg.git
6 years agomjpegenc: fix YUV444 with w%16!=0
Michael Niedermayer [Mon, 17 Dec 2012 23:46:31 +0000 (00:46 +0100)]
mjpegenc: fix YUV444 with w%16!=0

Fixes Ticket2040

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/indevs: update syntax for the color filter in the lavfi device examples
Stefano Sabatini [Mon, 17 Dec 2012 15:33:00 +0000 (16:33 +0100)]
doc/indevs: update syntax for the color filter in the lavfi device examples

6 years agodoc/texi2pod: correctly handle @url commands in the form @url{URL,...}
Stefano Sabatini [Mon, 17 Dec 2012 13:29:17 +0000 (14:29 +0100)]
doc/texi2pod: correctly handle @url commands in the form @url{URL,...}

Ignore the other arguments, which have not to be processed by the POD
renderer.

6 years agodoc/Makefile: add docclean rule
Stefano Sabatini [Mon, 17 Dec 2012 12:39:53 +0000 (13:39 +0100)]
doc/Makefile: add docclean rule

This allows to clean the doc directory from the parent project dir.
The command:
make -C doc clean

does not work as long as the paths specified in doc/Makefile are relative
to the parent dir.

Also it is consitent with "testclean" and "distclean" targets.

6 years agodoc/texi2pod: add support to @ifhtml and @ifnothtml directives
Stefano Sabatini [Sun, 16 Dec 2012 19:16:43 +0000 (20:16 +0100)]
doc/texi2pod: add support to @ifhtml and @ifnothtml directives

With these commands it is possible to add HTML and non-HTML snippets,
which will be useful for the "See Also" manual chapters.

6 years agodoc: remove references to external documents
Stefano Sabatini [Sun, 16 Dec 2012 12:05:08 +0000 (13:05 +0100)]
doc: remove references to external documents

Fix a few warnings generated when creating the manuals.

Our current doc generation toolchain does not allow to reference external
documents.

6 years agooggparsevorbis: check channels
Michael Niedermayer [Mon, 17 Dec 2012 19:51:07 +0000 (20:51 +0100)]
oggparsevorbis: check channels

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSAP muxer set session name from metadata
Jernej Virag [Mon, 17 Dec 2012 09:04:15 +0000 (10:04 +0100)]
SAP muxer set session name from metadata

Pass "title" metadata field to av_sdp_create (as in RTP muxer) in SAP
muxer for correct
session name in SAP SDP announcements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconcatdec: change data type to suppress warning about limited range of data type...
Michael Niedermayer [Mon, 17 Dec 2012 13:20:29 +0000 (14:20 +0100)]
concatdec: change data type to suppress warning about limited range of data type on some platforms.

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoxy: Clarify what avpriv_set_pts_info does
Derek Buitenhuis [Sun, 16 Dec 2012 20:29:12 +0000 (15:29 -0500)]
doxy: Clarify what avpriv_set_pts_info does

The "pts for a given stream" was nonsensical.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge remote-tracking branch 'ramiro/dshow'
Michael Niedermayer [Mon, 17 Dec 2012 13:38:22 +0000 (14:38 +0100)]
Merge remote-tracking branch 'ramiro/dshow'

* ramiro/dshow:
  dshow: call CoUninitialize() on dshow_read_close()
  dshow: handle events in graph

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 17 Dec 2012 13:11:43 +0000 (14:11 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avresample: use valid log context in mixing functions
  lavr: remove automatic context close/open for resampling compensation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f322b2073581119de5da74f92a03309a36891cfa'
Michael Niedermayer [Mon, 17 Dec 2012 13:06:06 +0000 (14:06 +0100)]
Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'

* commit 'f322b2073581119de5da74f92a03309a36891cfa':
  lavr: only save/restore the mixing matrix if mixing is being done
  rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
  rtpenc: Allow including a SDES/CNAME block in RTCP SR packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8'
Michael Niedermayer [Mon, 17 Dec 2012 12:46:46 +0000 (13:46 +0100)]
Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8'

* commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8':
  rtpenc_vp8: Include the picture number in VP8 packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosiff: set duration
Piotr Bandurski [Sun, 16 Dec 2012 15:03:16 +0000 (16:03 +0100)]
siff: set duration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoisom: support SGI RLE 8-bit in QuickTime file format
Peter Ross [Mon, 17 Dec 2012 09:37:54 +0000 (20:37 +1100)]
isom: support SGI RLE 8-bit in QuickTime file format

Signed-off-by: Peter Ross <pross@xvid.org>
6 years agoSilicon Graphics Movie (.mv) demuxer
Peter Ross [Mon, 17 Dec 2012 09:37:54 +0000 (20:37 +1100)]
Silicon Graphics Movie (.mv) demuxer

Signed-off-by: Peter Ross <pross@xvid.org>
6 years agoSilicon Graphics Motion Video Compressor 1 & 2 decoder
Peter Ross [Mon, 17 Dec 2012 09:37:54 +0000 (20:37 +1100)]
Silicon Graphics Motion Video Compressor 1 & 2 decoder

Signed-off-by: Peter Ross <pross@xvid.org>
6 years agoSGI RLE 8-bit decoder
Peter Ross [Mon, 17 Dec 2012 09:37:54 +0000 (20:37 +1100)]
SGI RLE 8-bit decoder

Signed-off-by: Peter Ross <pross@xvid.org>
6 years agodshow: call CoUninitialize() on dshow_read_close()
Ramiro Polla [Mon, 17 Dec 2012 05:44:51 +0000 (03:44 -0200)]
dshow: call CoUninitialize() on dshow_read_close()

Every call to CoInitialize should have a matching CoUnititalize.

Based on patch by Don Moir <donmoir@comcast.net>.

6 years agodshow: handle events in graph
Ramiro Polla [Mon, 17 Dec 2012 05:44:12 +0000 (03:44 -0200)]
dshow: handle events in graph

Handling DirectShow events prevents infinite loops when there is an error in
the graph, such as a device being disconnected. This makes it possible for
dshow to return an error to the caller and run the cleanup code.

Based on patch by Don Moir <donmoir@comcast.net>.

6 years agoavresample: use valid log context in mixing functions
Hendrik Leppkes [Sun, 16 Dec 2012 08:52:35 +0000 (09:52 +0100)]
avresample: use valid log context in mixing functions

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agosctp: dont abort on invalid input
Michael Niedermayer [Mon, 17 Dec 2012 00:53:35 +0000 (01:53 +0100)]
sctp: dont abort on invalid input

Fixes Ticket1865

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3dec: fix outptr increment.
Michael Niedermayer [Mon, 17 Dec 2012 00:35:14 +0000 (01:35 +0100)]
ac3dec: fix outptr increment.

Fixes decoding regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavr: only save/restore the mixing matrix if mixing is being done
Justin Ruggles [Fri, 30 Nov 2012 01:49:36 +0000 (20:49 -0500)]
lavr: only save/restore the mixing matrix if mixing is being done

6 years agolavr: remove automatic context close/open for resampling compensation
Justin Ruggles [Fri, 30 Nov 2012 01:58:05 +0000 (20:58 -0500)]
lavr: remove automatic context close/open for resampling compensation

It adds unnecessary complication for insignificant usability improvement.
The user really should know if they'll need resampling compensation before
opening the context.

Note that only the documentation has changed. The current functionality will
still work until the next major bump.

6 years agoh264: Improve first slice and slice type checks
Michael Niedermayer [Sun, 16 Dec 2012 23:48:33 +0000 (00:48 +0100)]
h264: Improve first slice and slice type checks

This prevents a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/resampling_audio.c: fix path
Michael Niedermayer [Sun, 16 Dec 2012 20:36:42 +0000 (21:36 +0100)]
doc/examples/resampling_audio.c: fix path

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr/doxy: fix missing quote in code example.
Clément Bœsch [Sun, 16 Dec 2012 20:04:54 +0000 (21:04 +0100)]
swr/doxy: fix missing quote in code example.

6 years agolavu/pixdesc: fix a const qualifier discarding warning.
Clément Bœsch [Sun, 16 Dec 2012 19:41:28 +0000 (20:41 +0100)]
lavu/pixdesc: fix a const qualifier discarding warning.

6 years agolavu: make sure av_pix_fmt_desc_next returns a valid pix fmt.
Clément Bœsch [Sat, 15 Dec 2012 22:28:15 +0000 (23:28 +0100)]
lavu: make sure av_pix_fmt_desc_next returns a valid pix fmt.

This is required because there are some "holes" in the list for
compatibility with the fork.

The commit also removes the now unecessary check from cmdutils.

Found-by: wm4
6 years agortpdec_vp8: Cosmetics: Fix bad alignment/indentation
Martin Storsjö [Wed, 12 Dec 2012 14:59:45 +0000 (16:59 +0200)]
rtpdec_vp8: Cosmetics: Fix bad alignment/indentation

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpenc: Allow including a SDES/CNAME block in RTCP SR packets
Martin Storsjö [Fri, 3 Apr 2009 15:08:07 +0000 (18:08 +0300)]
rtpenc: Allow including a SDES/CNAME block in RTCP SR packets

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpenc_vp8: Include the picture number in VP8 packets
Martin Storsjö [Sun, 9 Dec 2012 23:10:42 +0000 (01:10 +0200)]
rtpenc_vp8: Include the picture number in VP8 packets

This makes it easier for receivers to decide what to do if data
is lost.

Refactor calculating the max payload size, to avoid hardcoding the
header size in too many places, reducing the number of lines that
have to be touched if the header is adjusted further.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agobfi: set duration
Piotr Bandurski [Sun, 16 Dec 2012 14:52:59 +0000 (15:52 +0100)]
bfi: set duration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobrstm: ask for samples for version != 1.0
Michael Niedermayer [Sun, 16 Dec 2012 11:57:43 +0000 (12:57 +0100)]
brstm: ask for samples for version != 1.0

This also avoids 2 unused variable warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegenc: fix 444 block count so it is below 10
Michael Niedermayer [Sun, 16 Dec 2012 13:42:31 +0000 (14:42 +0100)]
mjpegenc: fix 444 block count so it is below 10

Fixes Ticket1990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobrstm: add missing new line to request for sample messages
Paul B Mahol [Sun, 16 Dec 2012 13:02:58 +0000 (13:02 +0000)]
brstm: add missing new line to request for sample messages

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/filters: fix "Dolby Pro Logic II" option name
Michael Niedermayer [Sun, 16 Dec 2012 12:24:59 +0000 (13:24 +0100)]
doc/filters: fix "Dolby Pro Logic II" option name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 16 Dec 2012 12:21:36 +0000 (13:21 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: fix memleak on error during SPS parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/crop: free x and y parsed expression objects
Stefano Sabatini [Sun, 16 Dec 2012 12:14:44 +0000 (13:14 +0100)]
lavfi/crop: free x and y parsed expression objects

Fix leak introduced in 1e5492ffe6609fa0059d1a64fb3c4d5fd285a88c.

6 years agoMerge commit '27c8337e595a058347150269d5c2c48281e4285b'
Michael Niedermayer [Sun, 16 Dec 2012 12:08:53 +0000 (13:08 +0100)]
Merge commit '27c8337e595a058347150269d5c2c48281e4285b'

* commit '27c8337e595a058347150269d5c2c48281e4285b':
  h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
  lavr: move AudioMix struct definition to audio_mix.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: fix idf demuxer dependency
Paul B Mahol [Sun, 16 Dec 2012 11:57:42 +0000 (11:57 +0000)]
build: fix idf demuxer dependency

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoRemove 8SVX_RAW on next lavc mayor bump
Paul B Mahol [Mon, 10 Dec 2012 16:18:12 +0000 (16:18 +0000)]
Remove 8SVX_RAW on next lavc mayor bump

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoaiff: support in24/in32 tags
Piotr Bandurski [Sun, 16 Dec 2012 10:39:18 +0000 (10:39 +0000)]
aiff: support in24/in32 tags

Supported by QuickTime, libaudiofile and Csound.

6 years agobrstm: fix number of samples for the last block
James Almer [Sun, 16 Dec 2012 00:15:04 +0000 (21:15 -0300)]
brstm: fix number of samples for the last block

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agothp: set duration
Piotr Bandurski [Sun, 16 Dec 2012 10:27:54 +0000 (10:27 +0000)]
thp: set duration

6 years agoffplay: provide some feedback in case the codec cannot be set
Stefano Sabatini [Sat, 15 Dec 2012 21:52:23 +0000 (22:52 +0100)]
ffplay: provide some feedback in case the codec cannot be set

6 years agoffplay: set codec_id in codec context
Stefano Sabatini [Sat, 15 Dec 2012 21:42:21 +0000 (22:42 +0100)]
ffplay: set codec_id in codec context

Set codec id in case another codec is forced on the context (e.g. when
the user specify the codec with -codec).

For example fix:
ffplay -vcodec pgmyuv -i "tests/vsynth1/%02d.pgm"

6 years agoffplay: improve robustness of opt_codec(), and add options acodec,vcodec,scodec
Stefano Sabatini [Sat, 15 Dec 2012 21:40:26 +0000 (22:40 +0100)]
ffplay: improve robustness of opt_codec(), and add options acodec,vcodec,scodec

Fail with a meaningfull error message in case of bogus input.

Also the new options are more consistent with the rest of the tool
options, since it does not support generic stream specifiers.

6 years agoffmpeg: Improve filter input fps selection heuristic.
Michael Niedermayer [Sun, 16 Dec 2012 04:09:23 +0000 (05:09 +0100)]
ffmpeg: Improve filter input fps selection heuristic.

This fixes a broken file that has a incorrect timebase at the codec level.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowrap_timestamp: remove unneeded check
Michael Niedermayer [Sun, 16 Dec 2012 00:07:53 +0000 (01:07 +0100)]
wrap_timestamp: remove unneeded check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: fix integer overflows
Michael Niedermayer [Sat, 15 Dec 2012 23:56:12 +0000 (00:56 +0100)]
lavf: fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: dont mess with frame gaps on second fields.
Michael Niedermayer [Sat, 15 Dec 2012 22:33:20 +0000 (23:33 +0100)]
h264: dont mess with frame gaps on second fields.

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: replace magic number with VSYNC_CFR
Peter Ross [Fri, 14 Dec 2012 12:31:41 +0000 (23:31 +1100)]
ffmpeg: replace magic number with VSYNC_CFR

6 years agolavf: Provide a monotonic timestamp to the outside world
Harald Axmann [Sun, 2 Dec 2012 18:27:21 +0000 (19:27 +0100)]
lavf: Provide a monotonic timestamp to the outside world

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc/rv20: width and height must be multiple of 4
Piotr Bandurski [Sat, 15 Dec 2012 16:51:26 +0000 (17:51 +0100)]
mpegvideo_enc/rv20: width and height must be multiple of 4

RealPlayer does not play rv20 files when sizes are not multiple of 4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: remove @example use for showing syntax
Stefano Sabatini [Sat, 15 Dec 2012 20:02:30 +0000 (21:02 +0100)]
doc/filters: remove @example use for showing syntax

I forgot to merge with the previous commit.

6 years agodoc/filters: extend syntax description for transpose, and add examples
Stefano Sabatini [Wed, 12 Dec 2012 11:36:25 +0000 (12:36 +0100)]
doc/filters: extend syntax description for transpose, and add examples

6 years agodoc/filters: add basic crop examples
Stefano Sabatini [Sat, 15 Dec 2012 16:08:18 +0000 (17:08 +0100)]
doc/filters: add basic crop examples

Use it to show difference between shorthand and named parameters.

6 years agodoc/filters: itemize crop examples
Stefano Sabatini [Sat, 15 Dec 2012 16:03:12 +0000 (17:03 +0100)]
doc/filters: itemize crop examples

6 years agolavfi/crop: add support to option parsing
Stefano Sabatini [Sat, 15 Dec 2012 15:57:43 +0000 (16:57 +0100)]
lavfi/crop: add support to option parsing

Also fix documentation accordingly.

6 years agoh264: fix memleak on error during SPS parsing
Janne Grunau [Fri, 14 Dec 2012 20:08:24 +0000 (21:08 +0100)]
h264: fix memleak on error during SPS parsing

Introduced in d7d6efe42b0d.

6 years agoh264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
Janne Grunau [Fri, 14 Dec 2012 22:22:55 +0000 (23:22 +0100)]
h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup

Since a NAL_DPA can start a new frame it has to be handled before
ff_thread_finish_setup is called.

6 years agolavr: move AudioMix struct definition to audio_mix.c
Justin Ruggles [Fri, 14 Dec 2012 02:18:15 +0000 (21:18 -0500)]
lavr: move AudioMix struct definition to audio_mix.c

6 years agodirac_parser: check prev_pu_offset before using it
Michael Niedermayer [Sat, 15 Dec 2012 15:03:19 +0000 (16:03 +0100)]
dirac_parser: check prev_pu_offset before using it

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc/rv10: width and hieghtmust be multiple of 16
Piotr Bandurski [Thu, 13 Dec 2012 16:33:42 +0000 (17:33 +0100)]
mpegvideo_enc/rv10: width and hieghtmust be multiple of 16

RealPlayer does not play correctly rv10 files when sizes are not multiple of 16

"RealVideo Encoder 1.0 supports any size image that is a multiple of sixteen pixels."

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/dshow: rename dshow class name
rogerdpack [Thu, 13 Dec 2012 20:33:59 +0000 (13:33 -0700)]
lavd/dshow: rename dshow class name

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 15 Dec 2012 13:18:13 +0000 (14:18 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp56: release frames on error

Conflicts:
libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/overlay: clarify/fix comment, add a few empty lines to ease readability
Stefano Sabatini [Sat, 15 Dec 2012 12:09:26 +0000 (13:09 +0100)]
lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability

6 years agolavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()
Stefano Sabatini [Sat, 15 Dec 2012 12:44:06 +0000 (13:44 +0100)]
lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()

Simplify.

6 years agolavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf
Stefano Sabatini [Sat, 15 Dec 2012 12:40:35 +0000 (13:40 +0100)]
lavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf

6 years agoMerge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'
Michael Niedermayer [Sat, 15 Dec 2012 12:41:06 +0000 (13:41 +0100)]
Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d'

* commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d':
  vp56: make parse_header return standard error codes

Conflicts:
libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: update fate for 1a490df12fd9
Michael Niedermayer [Sat, 15 Dec 2012 11:41:24 +0000 (12:41 +0100)]
fate: update fate for 1a490df12fd9

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: fill empty git commit hashes and dates
Stefano Sabatini [Sat, 15 Dec 2012 10:41:12 +0000 (11:41 +0100)]
doc/APIchanges: fill empty git commit hashes and dates

6 years agoffprobe: show pkt_size in frame
Stefano Sabatini [Fri, 14 Dec 2012 10:59:13 +0000 (11:59 +0100)]
ffprobe: show pkt_size in frame

Fix trac ticket #2027.

6 years agolavc: add pkt_size field to AVFrame
Stefano Sabatini [Fri, 14 Dec 2012 10:58:21 +0000 (11:58 +0100)]
lavc: add pkt_size field to AVFrame

6 years agofate: check if rsync has the contimeout option
Jean First [Wed, 7 Nov 2012 10:27:06 +0000 (11:27 +0100)]
fate: check if rsync has the contimeout option

rsync on osx misses the --contimeout option

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflashsv2_prime: check block before using it.
Michael Niedermayer [Fri, 14 Dec 2012 23:19:20 +0000 (00:19 +0100)]
flashsv2_prime: check block before using it.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadec: check xch_base_channel against channel_order_tab.
Michael Niedermayer [Fri, 14 Dec 2012 22:37:14 +0000 (23:37 +0100)]
dcadec: check xch_base_channel against channel_order_tab.

Fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3on4: fix null pointer dereference
Michael Niedermayer [Fri, 14 Dec 2012 20:50:23 +0000 (21:50 +0100)]
mp3on4: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodnxhddec: fix CID changed check.
Michael Niedermayer [Fri, 14 Dec 2012 19:57:25 +0000 (20:57 +0100)]
dnxhddec: fix CID changed check.

Fixes Null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: update asyncts reference
Michael Niedermayer [Fri, 14 Dec 2012 17:53:38 +0000 (18:53 +0100)]
fate: update asyncts reference

We cannot update the existing file because this would break
ffmpeg 1.0, which uses it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/segment: provide more debug feedback when a new segment starts
Stefano Sabatini [Thu, 13 Dec 2012 20:19:25 +0000 (21:19 +0100)]
lavf/segment: provide more debug feedback when a new segment starts

6 years agolavf/segment: add missing flags to segmenter option constants
Stefano Sabatini [Fri, 14 Dec 2012 10:44:31 +0000 (11:44 +0100)]
lavf/segment: add missing flags to segmenter option constants

6 years agoass_split_section: dont overread array
Michael Niedermayer [Fri, 14 Dec 2012 17:10:19 +0000 (18:10 +0100)]
ass_split_section: dont overread array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowestwood_vqa: fix null pointer dereference
Michael Niedermayer [Fri, 14 Dec 2012 16:55:25 +0000 (17:55 +0100)]
westwood_vqa: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 14 Dec 2012 14:57:53 +0000 (15:57 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ivi_common: check that scan pattern is set before using it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'
Michael Niedermayer [Fri, 14 Dec 2012 14:53:48 +0000 (15:53 +0100)]
Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
  ivi_common: use proper logging context in ivi_decode_blocks().
  ivi_common: make some functions and tables static.
  asyncts: ignore min_delta only if first_pts is set

Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
Michael Niedermayer [Fri, 14 Dec 2012 14:42:58 +0000 (15:42 +0100)]
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'

* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
  asyncts: merge two conditions
  x86inc: fully concatenate tokens to fix macro expansion for nasm
  h264: initialize frame-mt context copies properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'
Michael Niedermayer [Fri, 14 Dec 2012 14:36:37 +0000 (15:36 +0100)]
Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'

* commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13':
  mpegvideo: treat delayed pictures as used

Conflicts:
libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'
Michael Niedermayer [Fri, 14 Dec 2012 14:30:12 +0000 (15:30 +0100)]
Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c':
  lavc: set frame parameters after decoding only if necessary

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: remove low_delay/has_b_frame setting code from nal loop
Michael Niedermayer [Fri, 14 Dec 2012 14:22:19 +0000 (15:22 +0100)]
h264: remove low_delay/has_b_frame setting code from nal loop

This code is now executed in h264_set_parameter_from_sps()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
Michael Niedermayer [Fri, 14 Dec 2012 14:00:28 +0000 (15:00 +0100)]
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'

* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
  h264: set parameters from SPS whenever it changes
  asyncts: cosmetics: reindent

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'
Michael Niedermayer [Fri, 14 Dec 2012 12:58:12 +0000 (13:58 +0100)]
Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'

* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
  doc: improve documentation for the asyncts filter first_pts option
  asyncts: fix the asyncts behavior when using the first_pts option

Conflicts:
libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'
Michael Niedermayer [Fri, 14 Dec 2012 12:51:16 +0000 (13:51 +0100)]
Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'

* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
  asyncts: use clipped delta value when setting resample compensation
  asyncts: fix flushing of final samples at EOF
  vp6: properly fail on unsupported feature

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp56: release frames on error
Luca Barbato [Fri, 14 Dec 2012 08:55:04 +0000 (09:55 +0100)]
vp56: release frames on error

Fixes CVE-2012-2783

CC: libav-stable@libav.org
6 years agovp56: make parse_header return standard error codes
Luca Barbato [Fri, 14 Dec 2012 07:22:06 +0000 (08:22 +0100)]
vp56: make parse_header return standard error codes

Returning 0 for failure is misleading.

CC: libav-stable@libav.org
6 years agoivi_common: check that scan pattern is set before using it.
Anton Khirnov [Thu, 13 Dec 2012 18:38:20 +0000 (19:38 +0100)]
ivi_common: check that scan pattern is set before using it.

Fixes CVE-2012-2791.

CC: libav-stable@libav.org
6 years agoivi_common: use proper logging context in ivi_decode_blocks().
Anton Khirnov [Thu, 13 Dec 2012 18:31:42 +0000 (19:31 +0100)]
ivi_common: use proper logging context in ivi_decode_blocks().