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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 years ago
Michael Niedermayer
22fbc7f8be
avformat/tcp: fix pointer to int warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
59360cd456
tools/graph2dot: fix use of deprecated *put_count
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1350a5c4d5
avfilter/graphparser: fix use of deprecated symbols
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7659ee350b
avfilter/graphdump: fix use of deprecated symbols
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f12174c8ce
avfilter/filtfmts: fix use of deprecated symbols
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 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>
11 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>
11 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>
11 years ago
Michael Niedermayer
ecbf838c7d
h264: prevent rbsp_buffer values from becoming duplicated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 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>
11 years ago
Michael Niedermayer
f55a7ba037
avcodec/ituh263dec: detect and warn about RTP
...
Fixes Ticket925
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5c6a58746b
ffplay: make next_nb_channels[] static const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 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>
11 years ago
Luca Barbato
08504380dd
mov: Refactor codec specific final steps in mov_finalize_stsd_codec
11 years ago
Luca Barbato
dc518a3ae2
mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle
11 years ago
Luca Barbato
ef196beeb5
mov: Refactor audio specific parsing in mov_parse_stsd_audio
11 years ago
Luca Barbato
a3b53ff062
mov: Refactor video specific parsing in mov_parse_stsd_video
11 years ago
Luca Barbato
bf98562505
mov: Refactor codec id selection in mov_codec_id
11 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.
11 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>
11 years ago
Michael Niedermayer
edf6fb64e0
Merge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'
...
* commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275':
libfdk-aacdec: formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f9418d156f
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
...
* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
vp56: Mark VP6-only optimizations as such.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b99d3613cf
avcodec/h263dec: use FF_CEIL_RSHIFT()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 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>
11 years ago
Paul B Mahol
b8ff4f5ea3
truemotion1: check av_fast_malloc() return value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
83b915d495
truemotion1: use av_freep()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
5cc8b81687
mpeg4videodec: fix GEOV/GEOX fliping
...
Fixes Ticket317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3941a4f5c2
snowenc: change a bunch of assert() to av_assert()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 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>
11 years ago
Alexander Strasser
b329ff3d43
MAINTAINERS: Add my GPG fingerprint
11 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>
11 years ago
Michael Niedermayer
9e477a3770
jpeg2000: fix null pointer dereference in case of malloc failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
09927f3eaa
jpeg2000: zero reslevel array on allocation
...
prevent use of uninitialized values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
912ce9dd20
jpeg2000: fix dereferencing invalid pointers
...
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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.
11 years ago
Diego Biurrun
84784c297f
libfdk-aacdec: formatting cosmetics
11 years ago
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.
11 years ago
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>
11 years ago
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>
11 years ago
Paul B Mahol
dd1d29bd5f
pngdec: use av_fast_padded_malloc(z)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
8fbf940e16
lavfi/tile: do not leak input frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Stefano Sabatini
0be3be9011
lavf/tee: copy metadata to output chained muxers
11 years ago
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>
11 years ago