Michael Niedermayer
5c6a58746b
ffplay: make next_nb_channels[] static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 19:53:11 +02:00
Michael Niedermayer
7495186fd4
avcodec/h263dec: fix aspect of lead h263 EHC
...
Fixes part of ticket925
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 18:59:58 +02:00
Luca Barbato
0b5af5cf12
mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd
2013-08-24 17:02:23 +02:00
Luca Barbato
08504380dd
mov: Refactor codec specific final steps in mov_finalize_stsd_codec
2013-08-24 17:02:23 +02:00
Luca Barbato
dc518a3ae2
mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle
2013-08-24 17:02:23 +02:00
Luca Barbato
ef196beeb5
mov: Refactor audio specific parsing in mov_parse_stsd_audio
2013-08-24 17:02:23 +02:00
Luca Barbato
a3b53ff062
mov: Refactor video specific parsing in mov_parse_stsd_video
2013-08-24 17:02:23 +02:00
Luca Barbato
bf98562505
mov: Refactor codec id selection in mov_codec_id
2013-08-24 17:02:23 +02:00
Diego Biurrun
ff9d57e7df
h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline
...
This ensures that decode_cabac_residual_internal actually does get inlined,
which it otherwise does not, even though it is marked as always_inline.
2013-08-24 16:14:15 +02:00
Michael Niedermayer
6067186f3a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 11:30:57 +02:00
Michael Niedermayer
edf6fb64e0
Merge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'
...
* commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275':
libfdk-aacdec: formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 11:23:25 +02:00
Michael Niedermayer
f9418d156f
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
...
* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
vp56: Mark VP6-only optimizations as such.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 11:04:11 +02:00
Michael Niedermayer
b99d3613cf
avcodec/h263dec: use FF_CEIL_RSHIFT()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 04:09:43 +02:00
Michael Niedermayer
9a271a9368
jpeg2000: check log2_cblk dimensions
...
Fixes out of array access
Fixes Ticket2895
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 03:42:54 +02:00
Paul B Mahol
b8ff4f5ea3
truemotion1: check av_fast_malloc() return value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-23 23:22:39 +00:00
Paul B Mahol
83b915d495
truemotion1: use av_freep()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-23 23:22:39 +00:00
Michael Niedermayer
5cc8b81687
mpeg4videodec: fix GEOV/GEOX fliping
...
Fixes Ticket317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 01:04:23 +02:00
Michael Niedermayer
3941a4f5c2
snowenc: change a bunch of assert() to av_assert()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-24 01:00:00 +02:00
Paul B Mahol
2a75459519
pngdec: do not release buffer on failure instead report full progress
...
Should fix heap-use-after-free as reported by Address Sanitizer.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-23 21:08:32 +00:00
Alexander Strasser
b329ff3d43
MAINTAINERS: Add my GPG fingerprint
2013-08-23 21:40:57 +02:00
Michael Niedermayer
aadfadd784
avformat/redspark: check coef_off
...
Fixes out of array reads
Found-by: Laurent Butti <laurentb@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 20:05:35 +02:00
Michael Niedermayer
9e477a3770
jpeg2000: fix null pointer dereference in case of malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 18:06:54 +02:00
Michael Niedermayer
09927f3eaa
jpeg2000: zero reslevel array on allocation
...
prevent use of uninitialized values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 18:06:54 +02:00
Michael Niedermayer
912ce9dd20
jpeg2000: fix dereferencing invalid pointers
...
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 17:36:53 +02:00
Diego Biurrun
f407856968
arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder
...
The functions are used by all codecs that enable the h264chroma component
and the file is already compiled conditional on h264chroma being enabled.
2013-08-23 17:21:14 +02:00
Diego Biurrun
84784c297f
libfdk-aacdec: formatting cosmetics
2013-08-23 17:11:47 +02:00
Diego Biurrun
8506ff97c9
vp56: Mark VP6-only optimizations as such.
...
Most of our VP56 optimizations are VP6-only and will stay that way.
So avoid compiling them for VP5-only builds.
2013-08-23 14:42:19 +02:00
Michael Niedermayer
800ea20cad
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenc: Make tkhd "enabled" flag QuickTime compatible
Conflicts:
libavformat/movenc.c
tests/ref/acodec/alac
tests/ref/acodec/pcm-s16be
tests/ref/acodec/pcm-s24be
tests/ref/acodec/pcm-s32be
tests/ref/acodec/pcm-s8
tests/ref/lavf/mov
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth1-prores
tests/ref/vsynth/vsynth1-qtrle
tests/ref/vsynth/vsynth1-svq1
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-svq1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 13:49:24 +02:00
Michael Niedermayer
c6f4a3a708
Merge commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7'
...
* commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7':
mov: use tkhd enabled flag to set the default track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 13:27:34 +02:00
Paul B Mahol
dd1d29bd5f
pngdec: use av_fast_padded_malloc(z)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-23 10:29:33 +00:00
Paul B Mahol
8fbf940e16
lavfi/tile: do not leak input frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-23 10:28:29 +00:00
Stefano Sabatini
0be3be9011
lavf/tee: copy metadata to output chained muxers
2013-08-23 12:27:09 +02:00
John Stebbins
30ce289074
movenc: Make tkhd "enabled" flag QuickTime compatible
...
QuickTime will play multiple audio tracks concurrently if this flag is
set for multiple audio tracks. And if no subtitle track has this flag
set, QuickTime will show no subtitles in the subtitle menu.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-23 09:55:42 +02:00
John Stebbins
1f70a5ad28
mov: use tkhd enabled flag to set the default track
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-08-23 09:24:22 +02:00
Michael Niedermayer
16a0d75c76
avcodec/mjpegdec: fix overread in find_marker()
...
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 04:44:55 +02:00
Carl Eugen Hoyos
2baa12f1d1
Fix dependencies for h263 vaapi decoder.
2013-08-23 02:11:49 +02:00
Michael Niedermayer
8bb11c3ca7
avcodec/jpeg2000dec: Check cdx/y values more carefully
...
Some invalid values where not handled correctly in the later pixel
format matching code.
Fixes out of array accesses
Fixes Ticket2848
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 01:02:03 +02:00
Michael Niedermayer
c443689afb
avformat/movenc: use av_freep() instead of av_free() except for local variables before return
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-23 00:31:15 +02:00
Paul B Mahol
b1e276f8df
lavfi/hue: allow changing brightness
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-22 14:56:13 +00:00
Paul B Mahol
6e643239d9
pngdec: frame multithreading support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-22 13:14:25 +00:00
Michael Niedermayer
f903b42663
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: Split DCT and FFT initialization into separate files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-22 14:28:42 +02:00
Stefano Sabatini
7af7b45c38
lavf/image2: extend start_number range to accept zero
...
Address trac ticket #2884 .
2013-08-22 14:26:23 +02:00
Michael Niedermayer
25e4ec6aa1
Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'
...
* commit '60198742ff851f11a3757c713fc75a9c19b88566':
movenc: fix detection of 64bit offset requirement
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-22 14:16:52 +02:00
Michael Niedermayer
606a30c5a1
Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'
...
* commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e':
movenc: Make chapter track QuickTime compatible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-22 13:58:23 +02:00
Michael Niedermayer
d68adbd666
Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'
...
* commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b':
movenc: add faststart option for web streaming
Conflicts:
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-22 13:37:16 +02:00
Michael Niedermayer
221a99aae7
Merge commit '4622f11f9c83db8a2e08408c71ff901826ca652c'
...
* commit '4622f11f9c83db8a2e08408c71ff901826ca652c':
w32pthread: help compiler figure out undeeded code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-22 13:09:24 +02:00
Michael Niedermayer
503aec1425
Merge commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4'
...
* commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4':
x86: h264_idct: Remove incorrect comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-22 13:04:07 +02:00
Paul B Mahol
139a98be8e
lavfi/gradfun: support gbrp
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-22 10:59:52 +00:00
Stefano Sabatini
eadb3ad758
lavf/tee: initialize ret in parse_bsfs()
...
Fix spurious failures.
2013-08-22 09:52:54 +02:00
Michael Niedermayer
3819db745d
avcodec/rpza: Perform pointer advance and checks before using the pointers
...
Fixes out of array accesses
Fixes Ticket2850
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-22 01:26:02 +02:00