Pavel Koshevoy
185fc52f19
avfilter/vf_fps: Work around msvc (c99wrap) build failure
...
c99wrap choked on initialization of .dbl start_time option with
AV_NOPTS_VALUE: Unable to parse int64_t as expression primary
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
09ea5048a9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
imc: support mode 1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
6063f012f2
Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'
...
* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b':
twinvq: set block align for codecs and use it in size checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e43c672b56
Merge commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63'
...
* commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63':
mov: Write tmcd extradata
This commit should make no difference as we had tmcd support
already, which is not changed.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
d3ff77023e
Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'
...
* commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f':
mov: Parse tmcd extradata
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b32a6da100
Merge commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d'
...
* commit '0b5af5cf1224add1769b1094b9924ecf10de3d7d':
mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e299aa78d9
Merge commit '08504380ddf25d6905e189e9bf52e7a4c771a415'
...
* commit '08504380ddf25d6905e189e9bf52e7a4c771a415':
mov: Refactor codec specific final steps in mov_finalize_stsd_codec
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
80e0599402
Merge commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e'
...
* commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e':
mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
9748f1477d
Merge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'
...
* commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4':
mov: Refactor audio specific parsing in mov_parse_stsd_audio
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
bc6370b622
Merge commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e'
...
* commit 'a3b53ff062eaccdaa28964899c63520ef2978c2e':
mov: Refactor video specific parsing in mov_parse_stsd_video
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f5a0c205d9
Merge commit 'bf9856250584228678963ce8f11c54f85005d783'
...
* commit 'bf9856250584228678963ce8f11c54f85005d783':
mov: Refactor codec id selection in mov_codec_id
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Kostya Shishkov
4eb4bb3a02
imc: support mode 1
12 years ago
Kostya Shishkov
9e7b62f0fb
twinvq: set block align for codecs and use it in size checks
...
This both allows factoring out size check for both MetaSound and TwinVQ-VQF
decoders and fixes the situation when there are several MetaSound frames
stuffed together (that happens in 8kHz @ 8kbps MetaSound in ASF for example).
12 years ago
Michael Niedermayer
8d679bc7e6
avformat/mp3dec: improve detection of mp3s with huge id3 tags
...
When a id3 tag is larger than the amount of space we will probe
give it a score similar to what a .mp3 extension would have given it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a9d1a7c79b
avformat: move PROBE_BUF_M* to internal.h
...
They will be used by the mp3 probe function in the next commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
22fbc7f8be
avformat/tcp: fix pointer to int warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
59360cd456
tools/graph2dot: fix use of deprecated *put_count
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1350a5c4d5
avfilter/graphparser: fix use of deprecated symbols
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7659ee350b
avfilter/graphdump: fix use of deprecated symbols
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f12174c8ce
avfilter/filtfmts: fix use of deprecated symbols
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Luca Barbato
b89e8759e0
mov: Write tmcd extradata
12 years ago
Luca Barbato
5b41eb91e0
mov: Parse tmcd extradata
12 years ago
Michael Niedermayer
21ba80214c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
626739ebbb
avcodec/h264: Free rbsp_buffer before copying context over it
...
Fixes memleak
Fixes Ticket1900
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
be30e44dd9
avcodec/h264: Zero rbsp_buffer earler to ensure no duplicated pointers can leak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ecbf838c7d
h264: prevent rbsp_buffer values from becoming duplicated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
88909beca3
avcodec/movenc: move chapter_properties under the #if of the code that uses it
...
Fixes warning about unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f55a7ba037
avcodec/ituh263dec: detect and warn about RTP
...
Fixes Ticket925
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
5c6a58746b
ffplay: make next_nb_channels[] static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7495186fd4
avcodec/h263dec: fix aspect of lead h263 EHC
...
Fixes part of ticket925
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Luca Barbato
0b5af5cf12
mov: Refactor multiple stsd skipping in mov_mov_skip_multiple_stsd
12 years ago
Luca Barbato
08504380dd
mov: Refactor codec specific final steps in mov_finalize_stsd_codec
12 years ago
Luca Barbato
dc518a3ae2
mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle
12 years ago
Luca Barbato
ef196beeb5
mov: Refactor audio specific parsing in mov_parse_stsd_audio
12 years ago
Luca Barbato
a3b53ff062
mov: Refactor video specific parsing in mov_parse_stsd_video
12 years ago
Luca Barbato
bf98562505
mov: Refactor codec id selection in mov_codec_id
12 years ago
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.
12 years ago
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>
12 years ago
Michael Niedermayer
edf6fb64e0
Merge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'
...
* commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275':
libfdk-aacdec: formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f9418d156f
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
...
* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
vp56: Mark VP6-only optimizations as such.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b99d3613cf
avcodec/h263dec: use FF_CEIL_RSHIFT()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
Paul B Mahol
b8ff4f5ea3
truemotion1: check av_fast_malloc() return value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
83b915d495
truemotion1: use av_freep()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
5cc8b81687
mpeg4videodec: fix GEOV/GEOX fliping
...
Fixes Ticket317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
3941a4f5c2
snowenc: change a bunch of assert() to av_assert()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
Alexander Strasser
b329ff3d43
MAINTAINERS: Add my GPG fingerprint
12 years ago
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>
12 years ago
Michael Niedermayer
9e477a3770
jpeg2000: fix null pointer dereference in case of malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago