ffmpeg.git
6 years agoCheck more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()
Carl Eugen Hoyos [Mon, 10 Jun 2013 23:04:49 +0000 (01:04 +0200)]
Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()

This makes the conversion function more robust.

6 years agodoc/metadata: add notes and examples regarding metadata usage with ffmpeg
Stefano Sabatini [Fri, 15 Apr 2011 14:14:22 +0000 (16:14 +0200)]
doc/metadata: add notes and examples regarding metadata usage with ffmpeg

6 years agovf_sab: Fix memleak
Michael Niedermayer [Mon, 10 Jun 2013 20:00:43 +0000 (22:00 +0200)]
vf_sab: Fix memleak

Fixes CID1030353
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: Check bpno in decode_cblk()
Michael Niedermayer [Sat, 8 Jun 2013 22:36:04 +0000 (00:36 +0200)]
jpeg2000dec: Check bpno in decode_cblk()

Fixes integer overflow in fate-redcode-demux

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 10 Jun 2013 14:12:32 +0000 (16:12 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Accept incomplete http cookies without domain.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago(lib)utvideodec: remove setting of color_primaries
Michael Niedermayer [Mon, 10 Jun 2013 14:00:59 +0000 (16:00 +0200)]
(lib)utvideodec: remove setting of color_primaries

Thanks-to: Paranoialmaniac
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAccept incomplete http cookies without domain.
Carl Eugen Hoyos [Mon, 10 Jun 2013 08:52:40 +0000 (10:52 +0200)]
Accept incomplete http cookies without domain.

Works around a bug in some servers that apparently send incomplete cookies.
Fixes a part of ticket #2619.

Reviewed-by: Micah Galizia
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Jun 2013 08:41:57 +0000 (10:41 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  utvideodec: Set colorspace by codec_tag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2578f1efd64f4efc30114c328d1eff9030429e59'
Michael Niedermayer [Mon, 10 Jun 2013 08:33:43 +0000 (10:33 +0200)]
Merge commit '2578f1efd64f4efc30114c328d1eff9030429e59'

* commit '2578f1efd64f4efc30114c328d1eff9030429e59':
  riff: Support ULH0 and ULH2 fourccs.
  utvideodec: Support ULH0 and ULH2 formats.

Conflicts:
libavcodec/utvideodec.c
libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideo: Add ULH0 and ULH2 decoding to the native decoder.
Stephen Hutchinson [Sun, 9 Jun 2013 12:08:04 +0000 (08:08 -0400)]
utvideo: Add ULH0 and ULH2 decoding to the native decoder.

Also prevents an error since the native decoder (if enabled) is
always used to probe Ut Video-encoded files, even if the user
forces libutvideo to be the decoder. Without this patch, the probe
would fail, and the video wouldn't get properly handed over,
resulting in failure to set codec parameters. When the native
decoder is disabled, libutvideo can probe and initialize decoding
without issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibutvideo: Add ULH0 and ULH2 decoding when using version 13.0.1
Stephen Hutchinson [Sun, 9 Jun 2013 12:08:03 +0000 (08:08 -0400)]
libutvideo: Add ULH0 and ULH2 decoding when using version 13.0.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideodec: Set colorspace by codec_tag.
Yusuke Nakamura [Sat, 8 Jun 2013 15:16:27 +0000 (00:16 +0900)]
utvideodec: Set colorspace by codec_tag.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agoriff: Support ULH0 and ULH2 fourccs.
Yusuke Nakamura [Sat, 8 Jun 2013 14:54:41 +0000 (23:54 +0900)]
riff: Support ULH0 and ULH2 fourccs.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agoutvideodec: Support ULH0 and ULH2 formats.
Yusuke Nakamura [Sat, 8 Jun 2013 14:23:16 +0000 (23:23 +0900)]
utvideodec: Support ULH0 and ULH2 formats.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agoswscale/swscale_unscaled: add ()
Michael Niedermayer [Mon, 10 Jun 2013 01:34:33 +0000 (03:34 +0200)]
swscale/swscale_unscaled: add ()

Fixes order of operations
Fixes CID1030350

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample/rematrix_template: Fix integer overflow in mix8to2
Michael Niedermayer [Mon, 10 Jun 2013 00:46:03 +0000 (02:46 +0200)]
swresample/rematrix_template: Fix integer overflow in mix8to2

Fixes: CID1030352
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample/rematrix_template: Fix integer overflow in mix6to2
Michael Niedermayer [Mon, 10 Jun 2013 00:39:48 +0000 (02:39 +0200)]
swresample/rematrix_template: Fix integer overflow in mix6to2

Fixes: CID1030351
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoInsert a newline before showing embedded svq1 messages.
Carl Eugen Hoyos [Sun, 9 Jun 2013 17:25:43 +0000 (19:25 +0200)]
Insert a newline before showing embedded svq1 messages.

Messages may start with a carriage return.

6 years agoid2v2: check the return value of decode_str()
Michael Niedermayer [Sun, 9 Jun 2013 15:25:39 +0000 (17:25 +0200)]
id2v2: check the return value of decode_str()

Fixes CID1030348
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: fix typo in height comparission
Michael Niedermayer [Sun, 9 Jun 2013 14:55:10 +0000 (16:55 +0200)]
g2meet: fix typo in height comparission

Fixes CID1030349
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: Check cursor parameters before writing them in the context
Michael Niedermayer [Sun, 9 Jun 2013 09:59:57 +0000 (11:59 +0200)]
g2meet: Check cursor parameters before writing them in the context

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/g2meet: check framebuf has been allocated before use
Michael Niedermayer [Sun, 9 Jun 2013 00:29:35 +0000 (02:29 +0200)]
avcodec/g2meet: check framebuf has been allocated before use

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSupport decoding G.722 in aiff.
Carl Eugen Hoyos [Sat, 8 Jun 2013 23:10:36 +0000 (01:10 +0200)]
Support decoding G.722 in aiff.

6 years agolavfi/pp: set out frame size.
Clément Bœsch [Sat, 8 Jun 2013 21:23:28 +0000 (23:23 +0200)]
lavfi/pp: set out frame size.

w/h from input frame are not copied in av_frame_copy_props(). This
commit avoids a mismatch between aligned_[wh] and outbuf->{width,height}
(and thus avoids triggering an assert in avfilter because of this).

6 years agoavformat/wavdec: Dont rescale timestamps but use exact comparission
Michael Niedermayer [Sat, 8 Jun 2013 17:22:34 +0000 (19:22 +0200)]
avformat/wavdec: Dont rescale timestamps but use exact comparission

Fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosmvjpegdec: No frame at all is an error
Michael Niedermayer [Sat, 8 Jun 2013 18:00:16 +0000 (20:00 +0200)]
smvjpegdec: No frame at all is an error

This fixes a infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowavpack: add missing .\n to entropy error message
Paul B Mahol [Sat, 8 Jun 2013 17:38:32 +0000 (17:38 +0000)]
wavpack: add missing .\n to entropy error message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomatroskadec: move ALAC extradata creation bellow AAC one
Paul B Mahol [Fri, 7 Jun 2013 10:06:15 +0000 (10:06 +0000)]
matroskadec: move ALAC extradata creation bellow AAC one

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sat, 8 Jun 2013 13:59:07 +0000 (15:59 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  ftp: add invalid code for RETR operation
  ftp: probe seek capability
  ftp: fix seeking beyond file size
  ftp: abort function optimalization
  ftp: explicit return code checks
  ftp: fix flush control connection input
  ftp: reconnect on tcp read error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/codecs: Mention relation of the experimental setting and codecs
Michael Niedermayer [Thu, 6 Jun 2013 09:40:46 +0000 (11:40 +0200)]
doc/codecs: Mention relation of the experimental setting and codecs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: Add libvo-aacenc doc
Timothy Gu [Sat, 8 Jun 2013 02:54:23 +0000 (19:54 -0700)]
doc/encoders: Add libvo-aacenc doc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 8 Jun 2013 10:38:18 +0000 (12:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  faxcompr: return meaningful errors

Conflicts:
libavcodec/faxcompr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f32aefcf349f2f1367f0143782397643416d18f3'
Michael Niedermayer [Sat, 8 Jun 2013 10:30:15 +0000 (12:30 +0200)]
Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3'

* commit 'f32aefcf349f2f1367f0143782397643416d18f3':
  faxcompr: K&R formatting cosmetics

Conflicts:
libavcodec/faxcompr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c'
Michael Niedermayer [Sat, 8 Jun 2013 10:21:14 +0000 (12:21 +0200)]
Merge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c'

* commit '9c2216976907336dfae0e8e38a4d70ca2465a92c':
  tiff: do not overread the source buffer

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'
Michael Niedermayer [Sat, 8 Jun 2013 09:41:58 +0000 (11:41 +0200)]
Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'

* commit '999ccd2d0a43640921088578f138c874f6cc0f8a':
  tiff: cleanup the error paths

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'
Michael Niedermayer [Sat, 8 Jun 2013 09:31:31 +0000 (11:31 +0200)]
Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'

* commit '016c5b066de08a93a5f6b5beb0ef377356b35cde':
  tiff: refactor fax support in a separate function

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '103937681d7e6afd3e8caf8937272575e450fb55'
Michael Niedermayer [Sat, 8 Jun 2013 09:18:37 +0000 (11:18 +0200)]
Merge commit '103937681d7e6afd3e8caf8937272575e450fb55'

* commit '103937681d7e6afd3e8caf8937272575e450fb55':
  tiff: refactor deflate support in a separate function

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'
Michael Niedermayer [Sat, 8 Jun 2013 08:50:24 +0000 (10:50 +0200)]
Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'

* commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1':
  h264_parser: K&R formatting cosmetics
  vorbis: return meaningful errors

Conflicts:
libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoftp: add invalid code for RETR operation
Lukasz Marek [Sat, 8 Jun 2013 01:34:56 +0000 (03:34 +0200)]
ftp: add invalid code for RETR operation

554 is possible invalid code:
- Restart not valid
- Command terminated due to server shutdown in progress
- etc...

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoftp: probe seek capability
Lukasz Marek [Fri, 7 Jun 2013 14:27:13 +0000 (16:27 +0200)]
ftp: probe seek capability

Make FTP streamed when server doesn't accept REST command

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoftp: fix seeking beyond file size
Lukasz Marek [Wed, 5 Jun 2013 10:58:38 +0000 (12:58 +0200)]
ftp: fix seeking beyond file size

adjust to ff* tools seek nature

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoftp: abort function optimalization
Lukasz Marek [Sun, 2 Jun 2013 22:42:00 +0000 (00:42 +0200)]
ftp: abort function optimalization

It seems some ftp servers doesn't respect ABOR command,
but closing both connection is slow.

This commit keeps control connection open when possible.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoftp: explicit return code checks
Lukasz Marek [Sun, 2 Jun 2013 23:39:01 +0000 (01:39 +0200)]
ftp: explicit return code checks

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoftp: fix flush control connection input
Lukasz Marek [Sun, 2 Jun 2013 00:22:46 +0000 (02:22 +0200)]
ftp: fix flush control connection input

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoftp: reconnect on tcp read error
Lukasz Marek [Sat, 1 Jun 2013 23:41:03 +0000 (01:41 +0200)]
ftp: reconnect on tcp read error

This commit reconnect both connections and retries before ftp_read returns an error.
Practical use case: resume after lock screen on iOS devices.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoavcodec/smvjpegdec: copy palette too
Michael Niedermayer [Fri, 7 Jun 2013 23:19:27 +0000 (01:19 +0200)]
avcodec/smvjpegdec: copy palette too

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 7 Jun 2013 19:28:24 +0000 (21:28 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not offer smvjpeg lowres capabilities, the decoder does not support it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/smvjpegdec: check that frames_per_jpeg cleanly divides height
Michael Niedermayer [Fri, 7 Jun 2013 18:36:48 +0000 (20:36 +0200)]
avcodec/smvjpegdec: check that frames_per_jpeg cleanly divides height

Fixes out of array access

If some valid files fail this check then please open a ticket and ping me and the smvjpegdec maintainer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDo not offer smvjpeg lowres capabilities, the decoder does not support it.
Carl Eugen Hoyos [Fri, 7 Jun 2013 17:40:03 +0000 (19:40 +0200)]
Do not offer smvjpeg lowres capabilities, the decoder does not support it.

Reviewed-by: Ash Hughes
6 years agofaxcompr: return meaningful errors
Luca Barbato [Mon, 3 Jun 2013 09:11:38 +0000 (11:11 +0200)]
faxcompr: return meaningful errors

And optionally forward them to the caller instead of concealing them.

Unify err and ret in a single variable.

6 years agofaxcompr: K&R formatting cosmetics
Luca Barbato [Mon, 3 Jun 2013 08:37:15 +0000 (10:37 +0200)]
faxcompr: K&R formatting cosmetics

6 years agotiff: do not overread the source buffer
Luca Barbato [Mon, 3 Jun 2013 02:53:02 +0000 (04:53 +0200)]
tiff: do not overread the source buffer

At least 2 bytes from the source are read every loop.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agotiff: cleanup the error paths
Luca Barbato [Mon, 3 Jun 2013 02:00:43 +0000 (04:00 +0200)]
tiff: cleanup the error paths

Return the proper error values and optionally report them.

6 years agotiff: refactor fax support in a separate function
Luca Barbato [Mon, 3 Jun 2013 01:58:17 +0000 (03:58 +0200)]
tiff: refactor fax support in a separate function

6 years agotiff: refactor deflate support in a separate function
Luca Barbato [Mon, 3 Jun 2013 01:51:05 +0000 (03:51 +0200)]
tiff: refactor deflate support in a separate function

Report when zlib support is missing.

6 years agoh264_parser: K&R formatting cosmetics
Luca Barbato [Thu, 6 Jun 2013 06:02:50 +0000 (08:02 +0200)]
h264_parser: K&R formatting cosmetics

6 years agovorbis: return meaningful errors
Luca Barbato [Fri, 17 May 2013 11:34:25 +0000 (13:34 +0200)]
vorbis: return meaningful errors

6 years agodoc/filters: fix alias option name for chroma_mode in 'il' filter.
Tim.Nicholson [Fri, 7 Jun 2013 14:24:14 +0000 (15:24 +0100)]
doc/filters: fix alias option name for chroma_mode in 'il' filter.

6 years agoavformat/mov: compute dts_shift with trun cts
Alexandre Sicard [Fri, 7 Jun 2013 12:56:16 +0000 (14:56 +0200)]
avformat/mov: compute dts_shift with trun cts

Some movies have negative composition time offsets in their trun, causing pts <
dts errors. This patch makes use of dts_shift to handle them.

Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
6 years agocmdutils: print threading capabilities for audio codecs
Paul B Mahol [Fri, 7 Jun 2013 14:24:52 +0000 (14:24 +0000)]
cmdutils: print threading capabilities for audio codecs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosmvjpegdec: only extract picture when a picture has been decoded.
Michael Niedermayer [Fri, 7 Jun 2013 12:20:59 +0000 (14:20 +0200)]
smvjpegdec: only extract picture when a picture has been decoded.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotta: unbreak demuxing of files with id3 tags at start of file
Paul B Mahol [Fri, 7 Jun 2013 10:28:13 +0000 (10:28 +0000)]
tta: unbreak demuxing of files with id3 tags at start of file

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotta: replace datalen with nb_samples
Paul B Mahol [Fri, 7 Jun 2013 09:49:04 +0000 (09:49 +0000)]
tta: replace datalen with nb_samples

This is less confusing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosonicenc: don't allocate unused avctx->coded_frame
Paul B Mahol [Thu, 6 Jun 2013 16:06:37 +0000 (16:06 +0000)]
sonicenc: don't allocate unused avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopcmenc: don't allocate unused avctx->coded_frame
Paul B Mahol [Thu, 6 Jun 2013 16:03:44 +0000 (16:03 +0000)]
pcmenc: don't allocate unused avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoalacenc: don't allocate unused avctx->coded_frame
Paul B Mahol [Thu, 6 Jun 2013 15:58:03 +0000 (15:58 +0000)]
alacenc: don't allocate unused avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoid3v2: read all textual chapter subframes
Paul B Mahol [Thu, 9 May 2013 13:09:28 +0000 (13:09 +0000)]
id3v2: read all textual chapter subframes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoflvdec: Fix mistakenly discarding metadata at dts==0
Atli Thorbjornsson [Thu, 6 Jun 2013 00:09:20 +0000 (00:09 +0000)]
flvdec: Fix mistakenly discarding metadata at dts==0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Jun 2013 08:17:14 +0000 (10:17 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Fix the alphabetical ordering in registering depacketizers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'
Michael Niedermayer [Fri, 7 Jun 2013 08:12:46 +0000 (10:12 +0200)]
Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'

* commit '2681924b0f3f35840dd9d9825df9f9239c448b22':
  libavformat: Fix standalone compilation of the webm muxer

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/lut3d: add sanity checks.
Clément Bœsch [Thu, 6 Jun 2013 23:42:18 +0000 (01:42 +0200)]
lavfi/lut3d: add sanity checks.

Should fix CID1026775 and CID1026774.

6 years agoAdd unscaled converter from GBRP > 8bit to RGBx48/64.
Carl Eugen Hoyos [Thu, 6 Jun 2013 21:57:50 +0000 (23:57 +0200)]
Add unscaled converter from GBRP > 8bit to RGBx48/64.

Fixes ticket #2633.

Tested-by: Michael Cinquin
6 years agotiff: simplify picking right pixel format
Paul B Mahol [Thu, 6 Jun 2013 21:42:02 +0000 (21:42 +0000)]
tiff: simplify picking right pixel format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc: add ONLY_IF_THREADS_ENABLED where it is missing
Paul B Mahol [Thu, 6 Jun 2013 20:17:36 +0000 (20:17 +0000)]
lavc: add ONLY_IF_THREADS_ENABLED where it is missing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agojpeg2000: Zero prec->cblk
Michael Niedermayer [Thu, 6 Jun 2013 20:02:54 +0000 (22:02 +0200)]
jpeg2000: Zero prec->cblk

Prevent use of uninitialized memory / valgrind failure

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: fix av_log()
Michael Niedermayer [Thu, 6 Jun 2013 19:34:35 +0000 (21:34 +0200)]
jpeg2000dec: fix av_log()

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotiff: correctly decode saparate planes with horizontal differencing predictor
Paul B Mahol [Thu, 6 Jun 2013 19:42:01 +0000 (19:42 +0000)]
tiff: correctly decode saparate planes with horizontal differencing predictor

Closes #2648.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/tee: pesudo → pseudo.
Clément Bœsch [Thu, 6 Jun 2013 18:29:18 +0000 (20:29 +0200)]
lavf/tee: pesudo → pseudo.

6 years agolavfi/il: add timeline support
Paul B Mahol [Thu, 6 Jun 2013 17:44:54 +0000 (17:44 +0000)]
lavfi/il: add timeline support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/framestep: cosmetics: reindent AVFilter
Paul B Mahol [Thu, 6 Jun 2013 17:19:16 +0000 (17:19 +0000)]
lavfi/framestep: cosmetics: reindent AVFilter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/framestep: add timeline support
Paul B Mahol [Thu, 6 Jun 2013 17:17:14 +0000 (17:17 +0000)]
lavfi/framestep: add timeline support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agortpdec: Fix the alphabetical ordering in registering depacketizers
Martin Storsjö [Thu, 6 Jun 2013 10:59:34 +0000 (13:59 +0300)]
rtpdec: Fix the alphabetical ordering in registering depacketizers

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibavformat: Fix standalone compilation of the webm muxer
Martin Storsjö [Thu, 6 Jun 2013 11:08:07 +0000 (14:08 +0300)]
libavformat: Fix standalone compilation of the webm muxer

The missing object file was added to the matroska muxer already, but
not to the webm muxer.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoAPIchanges: Add missing entry for SHA-2 512
James Almer [Thu, 6 Jun 2013 08:40:00 +0000 (05:40 -0300)]
APIchanges: Add missing entry for SHA-2 512

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: show chapter and chapter metadata information
Stefano Sabatini [Thu, 6 Jun 2013 07:54:58 +0000 (09:54 +0200)]
ffprobe: show chapter and chapter metadata information

Address trac ticket #2636.

6 years agojpeg2000dec: check that we have enough components for MCT
Michael Niedermayer [Thu, 6 Jun 2013 14:06:13 +0000 (16:06 +0200)]
jpeg2000dec: check that we have enough components for MCT

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: Use the matching coding style struct for transform selection
Michael Niedermayer [Thu, 6 Jun 2013 13:22:21 +0000 (15:22 +0200)]
jpeg2000dec: Use the matching coding style struct for transform selection

Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/hlsenc: fix bogus hls segment index rewrapping logic
Carl Eugen Hoyos [Thu, 6 Jun 2013 10:09:38 +0000 (12:09 +0200)]
lavf/hlsenc: fix bogus hls segment index rewrapping logic

The counter should not be reset since it detects the
hls segment increasing timeframe.

Fixes ticket #2643.

Reviewed-by: Stefano Sabatini
6 years agojpeg2000dec: Check that theres a SOT before SOD
Michael Niedermayer [Thu, 6 Jun 2013 08:50:33 +0000 (10:50 +0200)]
jpeg2000dec: Check that theres a SOT before SOD

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: Support 4 tile parts
Michael Niedermayer [Thu, 6 Jun 2013 01:01:17 +0000 (03:01 +0200)]
jpeg2000dec: Support 4 tile parts

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflacdec: don't call allocate_buffers() in init_thread_copy() when s->max_blocksize...
Paul B Mahol [Thu, 6 Jun 2013 01:00:56 +0000 (01:00 +0000)]
flacdec: don't call allocate_buffers() in init_thread_copy() when s->max_blocksize is 0

This is normal, and happens when no extradata was available at decoder
initialization.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoget_qcc: Check compno
Michael Niedermayer [Thu, 6 Jun 2013 00:19:24 +0000 (02:19 +0200)]
get_qcc: Check compno

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalac: frame multi-threading support
Paul B Mahol [Mon, 3 Jun 2013 16:45:26 +0000 (16:45 +0000)]
alac: frame multi-threading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agowavpack: frame multi-threading support
Paul B Mahol [Mon, 3 Jun 2013 16:22:46 +0000 (16:22 +0000)]
wavpack: frame multi-threading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agottadec: frame multi-threading support
Paul B Mahol [Mon, 3 Jun 2013 15:49:25 +0000 (15:49 +0000)]
ttadec: frame multi-threading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoflacdec: frame multi-threading support
Paul B Mahol [Mon, 3 Jun 2013 15:47:53 +0000 (15:47 +0000)]
flacdec: frame multi-threading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotakdec: frame multi-threading support
Paul B Mahol [Mon, 3 Jun 2013 15:42:39 +0000 (15:42 +0000)]
takdec: frame multi-threading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoaudio frame multi-threaded decoding
Paul B Mahol [Mon, 3 Jun 2013 14:43:18 +0000 (14:43 +0000)]
audio frame multi-threaded decoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMAINTAINERS: add fingerprint of the FFmpeg release signing key
Michael Niedermayer [Wed, 5 Jun 2013 21:28:23 +0000 (23:28 +0200)]
MAINTAINERS: add fingerprint of the FFmpeg release signing key

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: return error for invalid cdxy values
Michael Niedermayer [Wed, 5 Jun 2013 21:05:13 +0000 (23:05 +0200)]
jpeg2000dec: return error for invalid cdxy values

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>