ffmpeg.git
6 years agoMerge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'
Michael Niedermayer [Sun, 16 Jun 2013 22:36:25 +0000 (00:36 +0200)]
Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'

* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
  smacker: check the return value of smacker_decode_tree

Conflicts:
libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'
Michael Niedermayer [Sun, 16 Jun 2013 22:27:48 +0000 (00:27 +0200)]
Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'

* commit 'f52edef30197735bfb937e9e723ab1e7b31165c6':
  smacker: fix an off by one in huff.length computation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '985f34b75653d02eda8eb8def3412f8577f19b01'
Michael Niedermayer [Sun, 16 Jun 2013 22:21:22 +0000 (00:21 +0200)]
Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'

* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
  utils: fix avcodec_flush_buffers pre-reference counting compatibility

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'
Michael Niedermayer [Sun, 16 Jun 2013 22:05:02 +0000 (00:05 +0200)]
Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'

* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
  avf: move url utility functions in a separate file

Conflicts:
libavformat/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'
Michael Niedermayer [Sun, 16 Jun 2013 21:58:59 +0000 (23:58 +0200)]
Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'

* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
  avf: move ff_write_chained to mux.c

Conflicts:
libavformat/mux.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'
Michael Niedermayer [Sun, 16 Jun 2013 21:52:08 +0000 (23:52 +0200)]
Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'

* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
  avf: move riff tags accessors where they belong

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
Michael Niedermayer [Sun, 16 Jun 2013 21:45:42 +0000 (23:45 +0200)]
Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'

* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
  avf: move ff_http_match_no_proxy to network

Conflicts:
libavformat/internal.h
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'
Michael Niedermayer [Sun, 16 Jun 2013 21:38:27 +0000 (23:38 +0200)]
Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'

* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
  avf: split off format register and lookup function

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
Michael Niedermayer [Sun, 16 Jun 2013 21:29:37 +0000 (23:29 +0200)]
Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'

* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
  bitstream: forward error values and drop few abort()

Conflicts:
libavcodec/bitstream.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'
Michael Niedermayer [Sun, 16 Jun 2013 21:18:57 +0000 (23:18 +0200)]
Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'

* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
  bitstream: K&R formatting cosmetics

Conflicts:
libavcodec/bitstream.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'
Michael Niedermayer [Sun, 16 Jun 2013 20:59:59 +0000 (22:59 +0200)]
Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'

* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
  h264_mp4toannexb_bsf: return a padded buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'
Michael Niedermayer [Sun, 16 Jun 2013 20:51:56 +0000 (22:51 +0200)]
Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'

* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
  h264_mp4toannexb_bsf: factor out extradata parsing

Conflicts:
libavcodec/h264_mp4toannexb_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'
Michael Niedermayer [Sun, 16 Jun 2013 20:40:43 +0000 (22:40 +0200)]
Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'

* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

Conflicts:
libavcodec/h264_mp4toannexb_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: show APIC for tta files too
Paul B Mahol [Sun, 16 Jun 2013 18:49:51 +0000 (18:49 +0000)]
lavf: show APIC for tta files too

Fixes #2676.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotta: read ape tags last
Paul B Mahol [Sun, 16 Jun 2013 18:46:35 +0000 (18:46 +0000)]
tta: read ape tags last

Otherwise, cover art will create video stream with index 0.
Fixes #2677.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopostprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"
Michael Niedermayer [Sun, 16 Jun 2013 16:19:30 +0000 (18:19 +0200)]
postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

Fixes Ticket2675

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosmacker: check the return value of smacker_decode_tree
Kostya Shishkov [Wed, 12 Jun 2013 12:27:00 +0000 (14:27 +0200)]
smacker: check the return value of smacker_decode_tree

Also prevent a memory leak.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agosmacker: fix an off by one in huff.length computation
Kostya Shishkov [Wed, 12 Jun 2013 12:22:24 +0000 (14:22 +0200)]
smacker: fix an off by one in huff.length computation

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavcodec/jpeg2000dec: move bpno check to a earlier place
Michael Niedermayer [Sun, 16 Jun 2013 13:27:39 +0000 (15:27 +0200)]
avcodec/jpeg2000dec: move bpno check to a earlier place

This prevents additional integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutils: fix avcodec_flush_buffers pre-reference counting compatibility
Janne Grunau [Sat, 15 Jun 2013 19:11:55 +0000 (22:11 +0300)]
utils: fix avcodec_flush_buffers pre-reference counting compatibility

The to_free AVframe must be freed just like the other ones.
Indeed, the calling application may expect all frames to be
released.

(This regression caused use-after-free in VLC with hwaccel.)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavf: move url utility functions in a separate file
Luca Barbato [Sat, 15 Jun 2013 10:03:27 +0000 (12:03 +0200)]
avf: move url utility functions in a separate file

6 years agoavf: move ff_write_chained to mux.c
Luca Barbato [Sat, 15 Jun 2013 09:56:36 +0000 (11:56 +0200)]
avf: move ff_write_chained to mux.c

6 years agoavf: move riff tags accessors where they belong
Luca Barbato [Sat, 15 Jun 2013 09:44:07 +0000 (11:44 +0200)]
avf: move riff tags accessors where they belong

6 years agoavf: move ff_http_match_no_proxy to network
Luca Barbato [Sat, 15 Jun 2013 09:41:36 +0000 (11:41 +0200)]
avf: move ff_http_match_no_proxy to network

It is only used by network protocols.

6 years agoavf: split off format register and lookup function
Luca Barbato [Sat, 15 Jun 2013 09:26:09 +0000 (11:26 +0200)]
avf: split off format register and lookup function

6 years agolavu/adler32: Fix doxy group definition, take two
James Almer [Sun, 16 Jun 2013 00:29:08 +0000 (21:29 -0300)]
lavu/adler32: Fix doxy group definition, take two

The description if for the function, not the group.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/hash: Add support for RIPEMD
James Almer [Sun, 16 Jun 2013 00:29:07 +0000 (21:29 -0300)]
lavu/hash: Add support for RIPEMD

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorawdec: allocate a buffer in the appropriate size in the copy case.
Hendrik Leppkes [Sun, 16 Jun 2013 07:46:17 +0000 (09:46 +0200)]
rawdec: allocate a buffer in the appropriate size in the copy case.

Otherwise the created buffer can be smaller than buf_size, which results
in buffer overreads if the original image has extra padding on every line.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobitstream: forward error values and drop few abort()
Luca Barbato [Sat, 15 Jun 2013 08:28:30 +0000 (10:28 +0200)]
bitstream: forward error values and drop few abort()

6 years agobitstream: K&R formatting cosmetics
Luca Barbato [Sat, 15 Jun 2013 08:19:51 +0000 (10:19 +0200)]
bitstream: K&R formatting cosmetics

6 years agoMerge branch 'crypto' of https://github.com/jamrial/FFmpeg
Michael Niedermayer [Sat, 15 Jun 2013 23:07:13 +0000 (01:07 +0200)]
Merge branch 'crypto' of https://github.com/jamrial/FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: Add RIPEMD hashing
James Almer [Sat, 15 Jun 2013 17:04:19 +0000 (14:04 -0300)]
lavu: Add RIPEMD hashing

Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolavf/md5enc: Use AV_HASH_MAX_SIZE
James Almer [Sat, 15 Jun 2013 17:03:37 +0000 (14:03 -0300)]
lavf/md5enc: Use AV_HASH_MAX_SIZE

Also increase the buffer size in write_trailer(), since 128
is not enough anymore

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolavu/hash: Add support for SHA-2 512
James Almer [Sun, 2 Jun 2013 20:48:49 +0000 (17:48 -0300)]
lavu/hash: Add support for SHA-2 512

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolavu/utils: silence warnings about incompatible pointer types
Paul B Mahol [Sat, 15 Jun 2013 20:55:27 +0000 (20:55 +0000)]
lavu/utils: silence warnings about incompatible pointer types

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoDocument "cache" protocol
Andrey Utkin [Sat, 15 Jun 2013 20:03:38 +0000 (23:03 +0300)]
Document "cache" protocol

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_mp4toannexb_bsf: return a padded buffer
Luca Barbato [Tue, 11 Jun 2013 15:57:31 +0000 (17:57 +0200)]
h264_mp4toannexb_bsf: return a padded buffer

The code using the returned buffer might expect it to be
FF_INPUT_BUFFER_PADDING_SIZE padded as any other avpacket.

6 years agoh264_mp4toannexb_bsf: factor out extradata parsing
Luca Barbato [Tue, 11 Jun 2013 14:44:04 +0000 (16:44 +0200)]
h264_mp4toannexb_bsf: factor out extradata parsing

6 years agoavcodec/vc1dec: Check source picture availability in vc1_mc_4mv_chroma4()
Michael Niedermayer [Sat, 15 Jun 2013 11:10:43 +0000 (13:10 +0200)]
avcodec/vc1dec: Check source picture availability in vc1_mc_4mv_chroma4()

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/utils: check and warn about llrint() brokenness
Michael Niedermayer [Fri, 7 Jun 2013 00:25:34 +0000 (02:25 +0200)]
avutil/utils: check and warn about llrint() brokenness

Such broken llrint() exist for example on netbsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_mp4toannexb_bsf: K&R formatting cosmetics
Luca Barbato [Tue, 11 Jun 2013 14:12:01 +0000 (16:12 +0200)]
h264_mp4toannexb_bsf: K&R formatting cosmetics

6 years agolavu/md5: Add doxy
James Almer [Fri, 14 Jun 2013 08:42:57 +0000 (05:42 -0300)]
lavu/md5: Add doxy

Mostly a copy&paste from other hash functions, with changes
where required.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/crc: Fix doxy group definition
James Almer [Fri, 14 Jun 2013 08:42:56 +0000 (05:42 -0300)]
lavu/crc: Fix doxy group definition

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/adler32: Fix doxy group definition
James Almer [Fri, 14 Jun 2013 08:42:55 +0000 (05:42 -0300)]
lavu/adler32: Fix doxy group definition

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/g2meet: Check monochrome cursor width
Michael Niedermayer [Fri, 14 Jun 2013 19:13:47 +0000 (21:13 +0200)]
avcodec/g2meet: Check monochrome cursor width

Fixes out of array write

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/jpeg2000dec: check len before parsing header
Michael Niedermayer [Fri, 14 Jun 2013 17:20:10 +0000 (19:20 +0200)]
avcodec/jpeg2000dec: check len before parsing header

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/jpeg2000dec: Check Psot
Michael Niedermayer [Fri, 14 Jun 2013 17:16:47 +0000 (19:16 +0200)]
avcodec/jpeg2000dec: Check Psot

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoapetag: do not require seekable output
Paul B Mahol [Thu, 6 Jun 2013 13:35:49 +0000 (13:35 +0000)]
apetag: do not require seekable output

Also don't write empty tags.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec_encode_audio2: fix memleak on last padded frame
Michael Niedermayer [Fri, 14 Jun 2013 13:20:48 +0000 (15:20 +0200)]
avcodec_encode_audio2: fix memleak on last padded frame

Regression introduced by 799f57ac96f9891d1a0f7d6c4b218ed536e8aca5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: Enable muxing of SMPTE KLV metadata
Peter Ross [Thu, 11 Apr 2013 16:57:15 +0000 (09:57 -0700)]
mpegts: Enable muxing of SMPTE KLV metadata

Muxer code rebased/split out by: Jeff Blackburne <jblackburne@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1_parser: fix parsing of the frame headers in interlaced streams
Hendrik Leppkes [Thu, 13 Jun 2013 22:15:10 +0000 (00:15 +0200)]
vc1_parser: fix parsing of the frame headers in interlaced streams

first_pic_header_flag needs to be set to allow the parsing code to change
some stream parameters, and not error out.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/spp: fix description.
Clément Bœsch [Fri, 14 Jun 2013 04:53:45 +0000 (06:53 +0200)]
lavfi/spp: fix description.

6 years agodoc/general: Make the license status of the Android libraries clearer
Timothy Gu [Tue, 11 Jun 2013 23:52:12 +0000 (16:52 -0700)]
doc/general: Make the license status of the Android libraries clearer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodrawbox: Respect thickness parameter
Jean Delvare [Wed, 12 Jun 2013 08:48:57 +0000 (10:48 +0200)]
drawbox: Respect thickness parameter

The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.

Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.

As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.

Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000dec: Check compno in get_coc()
Michael Niedermayer [Thu, 13 Jun 2013 23:54:30 +0000 (01:54 +0200)]
jpeg2000dec: Check compno in get_coc()

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/mp: remove mp=spp.
Clément Bœsch [Thu, 13 Jun 2013 23:09:11 +0000 (01:09 +0200)]
lavfi/mp: remove mp=spp.

The filter was ported to a native libavfilter filter.

6 years agolavfi: add spp filter.
Clément Bœsch [Sat, 11 May 2013 10:03:38 +0000 (12:03 +0200)]
lavfi: add spp filter.

6 years agojpeg2000dec: dont set ncomponents to an invalid value
Michael Niedermayer [Thu, 13 Jun 2013 22:35:52 +0000 (00:35 +0200)]
jpeg2000dec: dont set ncomponents to an invalid value

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: copy AVCodecContext for threads
Paul B Mahol [Thu, 13 Jun 2013 21:49:18 +0000 (21:49 +0000)]
lavc: copy AVCodecContext for threads

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoflacdec: Fix used AVCodecContext
Michael Niedermayer [Thu, 13 Jun 2013 20:11:07 +0000 (22:11 +0200)]
flacdec: Fix used AVCodecContext

Fixes out of array writes with multiple threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/timestamp: remove ""
Michael Niedermayer [Thu, 13 Jun 2013 12:57:00 +0000 (14:57 +0200)]
avutil/timestamp: remove ""

This may fix an error with C++

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 13 Jun 2013 12:51:59 +0000 (14:51 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  4xm: check bitstream_size boundary before using it

Conflicts:
libavcodec/4xm.c

See: 9c661e95

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56'
Michael Niedermayer [Thu, 13 Jun 2013 12:38:01 +0000 (14:38 +0200)]
Merge commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56'

* commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56':
  4xm: refactor decode_p_block

Conflicts:
libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'
Michael Niedermayer [Thu, 13 Jun 2013 12:10:06 +0000 (14:10 +0200)]
Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'

* commit '94aefb1932be882fd93f66cf790ceb19ff575c19':
  4xm: do not overread the source buffer in decode_p_block

Conflicts:
libavcodec/4xm.c

The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'be373cb50d3c411366fec7eef2eb3681abe48f96'
Michael Niedermayer [Thu, 13 Jun 2013 11:56:14 +0000 (13:56 +0200)]
Merge commit 'be373cb50d3c411366fec7eef2eb3681abe48f96'

* commit 'be373cb50d3c411366fec7eef2eb3681abe48f96':
  4xm: do not overread the prestream buffer

Conflicts:
libavcodec/4xm.c

See: 9c661e95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'de2e5777e225e75813daf2373c95e223651fd89a'
Michael Niedermayer [Thu, 13 Jun 2013 11:41:27 +0000 (13:41 +0200)]
Merge commit 'de2e5777e225e75813daf2373c95e223651fd89a'

* commit 'de2e5777e225e75813daf2373c95e223651fd89a':
  4xm: validate the buffer size before parsing it

Conflicts:
libavcodec/4xm.c

See: 9c661e95

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '145023f57262d21474e35b4a6069cf95136339d4'
Michael Niedermayer [Thu, 13 Jun 2013 11:07:01 +0000 (13:07 +0200)]
Merge commit '145023f57262d21474e35b4a6069cf95136339d4'

* commit '145023f57262d21474e35b4a6069cf95136339d4':
  4xm: reject frames not compatible with the declared version

See: c433823750bf096187e70c22822431a7c0bb4202

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1f0c6075604c271d5627480f1243d22795f9a315'
Michael Niedermayer [Thu, 13 Jun 2013 10:57:34 +0000 (12:57 +0200)]
Merge commit '1f0c6075604c271d5627480f1243d22795f9a315'

* commit '1f0c6075604c271d5627480f1243d22795f9a315':
  4xm: drop pointless assert

Conflicts:
libavcodec/4xm.c

The added condition is impossible to occur and thus is added to the assert.
The assert is not removed from the default case, as the default case cannot
occur. Thus either it should stay as is or the case as a whole be removed.
For extra safety, to ensure this doesnt change the assert is changed to
av_assert0()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'
Michael Niedermayer [Thu, 13 Jun 2013 10:21:36 +0000 (12:21 +0200)]
Merge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'

* commit 'b8b809908ec547b2609dbac24194f4fd2df61aea':
  4xm: forward errors from decode_p_block

Conflicts:
libavcodec/4xm.c

Impossible to be false check has been replaced by av_assert0()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'
Michael Niedermayer [Thu, 13 Jun 2013 10:10:05 +0000 (12:10 +0200)]
Merge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'

* commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4':
  4xm: fold last_picture lazy allocation in decode_p_frame

Conflicts:
libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'
Michael Niedermayer [Thu, 13 Jun 2013 09:56:31 +0000 (11:56 +0200)]
Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'

* commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11':
  4xm: do not overread while parsing header

Conflicts:
libavformat/4xm.c

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

* commit 'e7a44f87d07655ec0cd31c315936931674434340':
  4xm: refactor fourxm_read_header

Conflicts:
libavformat/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'
Michael Niedermayer [Thu, 13 Jun 2013 07:50:42 +0000 (09:50 +0200)]
Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'

* commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654':
  4xm: K&R formatting cosmetics

Conflicts:
libavformat/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '08859d19b429c522d6494c186656f4a2d3ff8e21'
Michael Niedermayer [Thu, 13 Jun 2013 07:41:27 +0000 (09:41 +0200)]
Merge commit '08859d19b429c522d6494c186656f4a2d3ff8e21'

* commit '08859d19b429c522d6494c186656f4a2d3ff8e21':
  4xm: use the correct logging context
  g2meet: Fix a typo in the height comparison

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Try parsing SPS as complete NAL in more cases
Michael Niedermayer [Wed, 12 Jun 2013 22:46:15 +0000 (00:46 +0200)]
h264: Try parsing SPS as complete NAL in more cases

Fixes Ticket2580

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorequire --enable-gpl for using the frei0r filter
Stefano Sabatini [Wed, 12 Jun 2013 23:29:23 +0000 (01:29 +0200)]
require --enable-gpl for using the frei0r filter

frei0r license is GPL.

Based on a patch by Timothy Gu <timothygu99@gmail.com>.

See thread:
Subject: [FFmpeg-devel] [PATCH 1/2] LICENSE: Complete GPL'd external libraries list
Date: Thu,  6 Jun 2013 18:55:30 -0700

6 years agolavfi/rotate: add angle command
Stefano Sabatini [Tue, 11 Jun 2013 14:02:39 +0000 (16:02 +0200)]
lavfi/rotate: add angle command

6 years agotests: add filter-pixfmts-rotate test
Stefano Sabatini [Wed, 12 Jun 2013 15:24:44 +0000 (17:24 +0200)]
tests: add filter-pixfmts-rotate test

6 years agolavfi: add rotate filter
Stefano Sabatini [Tue, 11 Jun 2013 08:31:59 +0000 (10:31 +0200)]
lavfi: add rotate filter

Based on the libavfilter SOC filter by Vitor Sessak, with the following additions:
* integer arithmetic
* bilinear interpolation
* RGB path
* configurable parametric angle, output width and height

Address trac issue #1500.

See thread:
Subject: [FFmpeg-devel] [WIP] rotate filter(s)
Date: 2010-10-03 17:35:49 GMT

6 years agodoc/encoders: Add libvo-amrwbenc doc
Timothy Gu [Tue, 11 Jun 2013 23:58:01 +0000 (16:58 -0700)]
doc/encoders: Add libvo-amrwbenc doc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalacenc: Fix missing sign_extend()
Michael Niedermayer [Wed, 12 Jun 2013 14:16:59 +0000 (16:16 +0200)]
alacenc: Fix missing sign_extend()

Possibly fixes Ticket2497

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago4xm: check bitstream_size boundary before using it
Luca Barbato [Mon, 10 Jun 2013 14:37:43 +0000 (16:37 +0200)]
4xm: check bitstream_size boundary before using it

Prevent buffer overread.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years ago4xm: refactor decode_p_block
Luca Barbato [Sun, 9 Jun 2013 19:50:57 +0000 (21:50 +0200)]
4xm: refactor decode_p_block

Directly return from code 1, 2 and 6 codepaths and simplify the
remaining one to have a single overflow check and a single call to
mcdc.

6 years ago4xm: do not overread the source buffer in decode_p_block
Luca Barbato [Sun, 9 Jun 2013 16:27:05 +0000 (18:27 +0200)]
4xm: do not overread the source buffer in decode_p_block

Check for out of picture macroblocks before calling mcdc.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years ago4xm: do not overread the prestream buffer
Luca Barbato [Fri, 7 Jun 2013 14:18:22 +0000 (16:18 +0200)]
4xm: do not overread the prestream buffer

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years ago4xm: validate the buffer size before parsing it
Luca Barbato [Fri, 7 Jun 2013 14:16:46 +0000 (16:16 +0200)]
4xm: validate the buffer size before parsing it

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years ago4xm: reject frames not compatible with the declared version
Luca Barbato [Thu, 6 Jun 2013 14:58:57 +0000 (16:58 +0200)]
4xm: reject frames not compatible with the declared version

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years ago4xm: drop pointless assert
Luca Barbato [Thu, 6 Jun 2013 12:21:19 +0000 (14:21 +0200)]
4xm: drop pointless assert

Make sure the value of wlog2 is always between 0 and 3.

6 years ago4xm: forward errors from decode_p_block
Luca Barbato [Wed, 5 Jun 2013 20:33:34 +0000 (22:33 +0200)]
4xm: forward errors from decode_p_block

Partially mitigate out of memory writes.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years ago4xm: fold last_picture lazy allocation in decode_p_frame
Luca Barbato [Wed, 5 Jun 2013 18:30:48 +0000 (20:30 +0200)]
4xm: fold last_picture lazy allocation in decode_p_frame

6 years ago4xm: do not overread while parsing header
Luca Barbato [Wed, 5 Jun 2013 16:56:28 +0000 (18:56 +0200)]
4xm: do not overread while parsing header

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years ago4xm: refactor fourxm_read_header
Luca Barbato [Wed, 5 Jun 2013 16:45:45 +0000 (18:45 +0200)]
4xm: refactor fourxm_read_header

Split sound and video tag parsing in separate functions.

6 years ago4xm: K&R formatting cosmetics
Luca Barbato [Wed, 5 Jun 2013 15:32:49 +0000 (17:32 +0200)]
4xm: K&R formatting cosmetics

6 years ago4xm: use the correct logging context
Luca Barbato [Wed, 5 Jun 2013 15:12:16 +0000 (17:12 +0200)]
4xm: use the correct logging context

6 years agog2meet: Fix a typo in the height comparison
Michael Niedermayer [Sun, 9 Jun 2013 14:55:10 +0000 (16:55 +0200)]
g2meet: Fix a typo in the height comparison

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Jun 2013 09:53:27 +0000 (11:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g2meet: do not leak buffers
  g2meet: more graceful cursor loading
  g2meet: reset dimensions on header parsing errors

Conflicts:
libavcodec/g2meet.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: do not leak buffers
Kostya Shishkov [Tue, 11 Jun 2013 17:09:38 +0000 (19:09 +0200)]
g2meet: do not leak buffers

6 years agog2meet: more graceful cursor loading
Kostya Shishkov [Tue, 11 Jun 2013 17:07:38 +0000 (19:07 +0200)]
g2meet: more graceful cursor loading

6 years agog2meet: reset dimensions on header parsing errors
Kostya Shishkov [Tue, 11 Jun 2013 16:34:26 +0000 (18:34 +0200)]
g2meet: reset dimensions on header parsing errors

6 years agofate: Add test vectors for HMAC SHA and SHA-2
James Almer [Tue, 11 Jun 2013 08:03:55 +0000 (05:03 -0300)]
fate: Add test vectors for HMAC SHA and SHA-2

Also replace custom tests for MD5 with those published in RFC 2202

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>