Commits · n2.2.7 · sixue.cheng / FFmpeg

12 Aug, 2014 3 commits

Changelog: add entry for proresenc · 49fa3988
Michael Niedermayer authored 10 years ago

49fa3988

proresenc_kostya: report buffer overflow · 1ad1723c

Christophe Gisquet authored 10 years ago


If the allocated size, despite best efforts, is too small, exit
with the appropriate error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 52b81ff4

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1ad1723c

proresenc_kostya: remove unneeded parameters · 7740b111

Christophe Gisquet authored 10 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bf10f09b

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

7740b111

11 Aug, 2014 15 commits

Update for 2.2.7 · c0ad5f93
Michael Niedermayer authored 10 years ago
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c0ad5f93

avcodec/snow: fix null pointer dereference in cleanup after allocation failure · bb7f236c

Michael Niedermayer authored 10 years ago


Fixes: snowf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9a162146

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bb7f236c

avcodec/iff: check pixfmt for rgb8 / rgbn · 0397d434

Michael Niedermayer authored 10 years ago


Fixes out of array access
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3539d6c6

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0397d434

avutil/cpu: add aarch64 entries to 2nd table · ffc66ac0

Michael Niedermayer authored 10 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit efc4fe9d

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffc66ac0

ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codec · 588e7226

Michael Niedermayer authored 10 years ago


Fixes part of ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 956f4087

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

588e7226

Merge commit '' into release/2.2 · 0dc5868f

Michael Niedermayer authored 10 years ago

* commit '67134ad3

':
  h264: fix interpretation of interleaved stereo modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0dc5868f

avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet" · 723512ac

Michael Niedermayer authored 10 years ago


Add padding, clear size, use the correct pointer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4213fc5b

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

723512ac

Merge commit '' into release/2.2 · 963514ea

Michael Niedermayer authored 10 years ago

* commit 'd513c6a0

':
  svq1: do not modify the input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

963514ea

Merge commit '' into release/2.2 · c11b3010

Michael Niedermayer authored 10 years ago

* commit '18f48e05

':
  cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c11b3010

Merge commit '' into release/2.2 · 3301b248

Michael Niedermayer authored 10 years ago

* commit '5bf5a35f':
  cdgraphics: switch to bytestream2

Conflicts:
	libavcodec/cdgraphics.c

See: ad002e1a

Merged-by: Michael Niedermayer <michaelni@gmx.at>

3301b248

Merge commit '' into release/2.2 · 7b67ce9a

Michael Niedermayer authored 10 years ago

* commit '6598aaea':
  jpeg2000: enable 4 component pixel formats

See: f0358dc1

Merged-by: Michael Niedermayer <michaelni@gmx.at>

7b67ce9a

Merge commit '' into release/2.2 · 90a1c5e9

Michael Niedermayer authored 10 years ago

* commit 'a5992a27

':
  stereo3d: add missing include guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>

90a1c5e9

Merge commit '' into release/2.2 · 45a529d8

Michael Niedermayer authored 10 years ago

* commit 'aa943bd3':
  huffyuvdec: check width size for yuv422p

Conflicts:
	libavcodec/huffyuvdec.c

See: 6abb9a90

Merged-by: Michael Niedermayer <michaelni@gmx.at>

45a529d8

Merge commit '' into release/2.2 · 97cbad3d

Michael Niedermayer authored 10 years ago

* commit 'bea14966':
  mmvideo: check horizontal coordinate too

See: 8d3c99e8

Merged-by: Michael Niedermayer <michaelni@gmx.at>

97cbad3d

Merge commit '' into release/2.2 · 6419569a

Michael Niedermayer authored 10 years ago

* commit '6be5a3c0':
  wmalosslessdec: fix mclms_coeffs* array size

See: ec9578d5

Merged-by: Michael Niedermayer <michaelni@gmx.at>

6419569a

07 Aug, 2014 1 commit

h264: fix interpretation of interleaved stereo modes · 67134ad3

Felix Abecassis authored 10 years ago


Column and row frame packing arrangements were inverted.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

67134ad3

06 Aug, 2014 5 commits

svq1: do not modify the input packet · d513c6a0

Anton Khirnov authored 10 years ago

The input data must remain constant, make a copy instead. This is in
theory a performance hit, but since I failed to find any samples
using this feature, this should not matter in practice.

Also, check the size of the header, avoiding invalid reads on truncated
data.

CC:libav-stable@libav.org
(cherry picked from commit 7b588bb6

)
Signed-off-by: Anton Khirnov <anton@khirnov.net>

d513c6a0

cdgraphics: do not return 0 from the decode function · 18f48e05

Anton Khirnov authored 10 years ago

0 means no data consumed, so it can trigger an infinite loop in the
caller.

CC:libav-stable@libav.org
(cherry picked from commit c7d9b473

)
Signed-off-by: Anton Khirnov <anton@khirnov.net>

18f48e05

cdgraphics: switch to bytestream2 · 5bf5a35f

Anton Khirnov authored 10 years ago

Fixes possible invalid memory accesses on corrupted data.

CC:libav-stable@libav.org
Bug-ID: CVE-2013-3674
(cherry picked from commit a1599f3f

)
Signed-off-by: Anton Khirnov <anton@khirnov.net>

5bf5a35f

jpeg2000: enable 4 component pixel formats · 6598aaea
Vittorio Giovara authored 10 years ago
```
Bug-Id: 721
CC: libav-stable@libav.org
Sample-Id: 31230.mov
```
6598aaea
stereo3d: add missing include guards · a5992a27
Vittorio Giovara authored 11 years ago

a5992a27

05 Aug, 2014 16 commits

Changelog: fix typo · 1b996670

Michael Niedermayer authored 10 years ago

Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1b996670

version.sh: Print versions based on the last git tag for release branches · 1f4d779e

Michael Niedermayer authored 10 years ago

release branches are detected by checking if "git" is not in RELEASE
This changes "N-64706-g2f71aeb3" to "n2.3-8-g2f71aeb3

"
for git master theres no change

This should improve the readability of lists of versions which come from
more than 1 release branch or master + release. fate.ffmpeg.org is
one possible example
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee606fd0

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1f4d779e

remove VERSION file · f543d324

Michael Niedermayer authored 10 years ago


it overrides what version.sh prints and thus makes its output
from release branches rather useless
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2f71aeb3)

Conflicts:

	VERSION

f543d324

update for 2.2.6 · 2cbdbc36

Michael Niedermayer authored 10 years ago


Changelog by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2cbdbc36

huffyuvdec: check width size for yuv422p · aa943bd3

Michael Niedermayer authored 10 years ago


Avoid out of array accesses.

CC: libav-stable@libav.org
Bug-Id: CVE-2013-0848
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit a7153444

)
Signed-off-by: Anton Khirnov <anton@khirnov.net>

aa943bd3

mmvideo: check horizontal coordinate too · bea14966

Michael Niedermayer authored 10 years ago


Fixes out of array accesses.

Bug-Id: CVE-2013-3672
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 70cd3b8e

)
Signed-off-by: Anton Khirnov <anton@khirnov.net>

bea14966

wmalosslessdec: fix mclms_coeffs* array size · 6be5a3c0

Michael Niedermayer authored 11 years ago


Fixes corruption of context

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Bug-Id: CVE-2014-2098
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 849b9d34

)
Signed-off-by: Anton Khirnov <anton@khirnov.net>

6be5a3c0

ffserver: initialize pbuffer in prepare_sdp_description() · 119131fc

Michael Niedermayer authored 10 years ago


also check pbuffer before use

Found-by: CSA
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1d8d21b9

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

119131fc

avcodec/wavpackenc: Fix log2sample() result value · c13e38ba

Michael Niedermayer authored 10 years ago


Found-by: CSA
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e706fe76

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c13e38ba

avformat/tee: flip assigment direction · 01c4fe7e

Michael Niedermayer authored 10 years ago


Found-by: CSA
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2e6fdcb7

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

01c4fe7e

avcodec/dvdsub_parser: print message if packet is smaller than the packet size field · ad13a5c8

Michael Niedermayer authored 10 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bcc898dd

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ad13a5c8

avcodec/dvdsub_parser: Check buf_size before reading 32bit packet size · ce248bf7

Michael Niedermayer authored 10 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 81c1657a

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ce248bf7

avcodec/dvdsub_parser: never return 0 when the input isnt 0 · 8eaefbe1

Michael Niedermayer authored 10 years ago


Fixes a infinite loop
Fixes Ticket3804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cfdb30d2

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8eaefbe1

avcodec/mpeg12dec: fix support for interlaced mpeg2 with missing last slice · 81d8bad7

Michael Niedermayer authored 10 years ago


Fixes Ticket3809
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f95298c9

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

81d8bad7

v4l2enc: adding AVClass · 0aee4367

Anshul Maheswhwari authored 10 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fcb11ec2

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0aee4367

libavcodec/h264_parser: Increase parse_history, fix huge resolutions · cdaf9fb2

Michael Niedermayer authored 10 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0782fb6b

)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

cdaf9fb2

GitLab

Menu