Michael Niedermayer
d2a847c203
Merge remote-tracking branch 'hexene/scratchpad'
...
* hexene/scratchpad:
libstagefright: Explicitly free smart pointer objects
Changelog: Explain why C++ support is added, and that its optional
tools/build_libstagefright: rename build/libav to something neutral
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Mohamed Naufal
e7f9aa6ff5
libstagefright: Explicitly free smart pointer objects
13 years ago
Michael Niedermayer
1a2d8c8b35
Changelog: Explain why C++ support is added, and that its optional
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
elupus
9fa47cb773
make mpegts_get_pcr resync if it's not on a valid mpegts packet
13 years ago
elupus
6214266362
cosmetic reindent of mpegts_get_pcr
13 years ago
elupus
0a90b6a43e
check return value of url_fseek in mpegts_get_pcr
13 years ago
elupus
880e83827f
respect the maximum position mpegts_get_pcr is allowed to seek to
13 years ago
elupus
2130d2f594
remove unused code in mpegts_get_pcr
13 years ago
Michael Niedermayer
b5824233fb
tools/build_libstagefright: rename build/libav to something neutral
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
a30ef63354
ffplay: dont drop all frames if realtime decoding is impossible
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
5166376f24
smacker: fix a few off by 1 errors
...
stereo & 16bit is untested due to lack of samples
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Laurent Aimar
6489455495
Check for invalid VLC value in smacker decoder.
...
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Laurent Aimar
9676ffba83
Check and propagate errors when VLC trees cannot be built in smacker decoder.
...
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Kelly Anderson
872655fee9
dvdsubdec: fix bad free in dvdsub_init
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
15240feb99
Merge remote-tracking branch 'hexene/scratchpad'
...
* hexene/scratchpad:
Move & Rename buildscript, remove tabs
Fix regular build
Support (H/W accelerated) H.264 decoding on Android via Stagefright
Add build-script for Android
C++ Support ;)
Conflicts:
Changelog
Makefile
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
f27f68eb4f
Muxing WTV is supported.
13 years ago
Michael Niedermayer
6a507ccfe5
wtvenc: add some asserts because iam paranoid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
zhentan feng
438debd095
WTV muxer (2_wtvenc.patch, 3_add_wtv_muxer.patch)
13 years ago
Michael Niedermayer
d06c5b44cc
swscale: drop redundant code.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
1eb8014b49
swscale: add 14bit support to the "MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
7700846cf6
swscale: remove unused and forgotten file.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
1294ae6f94
Revert "Check if dxva2api.h is recent enough to compile vc1_dxva2_hwaccel."
...
This reverts commit 9104cd5161
.
Revert requested by ramiro
Conflicts:
configure
13 years ago
Michael Niedermayer
b62e42dafe
doc/ffmpeg: s/avserver/ffserver/
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
cac9877ed5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
include stdint.h in adpcm_data.h
mpeg12: reorder functions to avoid ugly forward declarations
Fixed off by one packet size allocation in the smacker demuxer.
Check for invalid packet size in the smacker demuxer.
ape demuxer: fix segfault on memory allocation failure.
xan: Add some buffer checks
xan: Remove extra trailing newline
Fixed size given to init_get_bits() in xan decoder.
Conflicts:
libavcodec/mpeg12.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
5ad01decef
ffprobe: rename print_{int,str}_f callbacks to print_{integer,string}.
...
Renamed for consistency. Also, since print_int() and print_str() are
already defined as macros, the long name version is preferred.
13 years ago
Clément Bœsch
3fdf519e4b
ffprobe: add JSON output printing format.
13 years ago
Clément Bœsch
afbeb49456
ffprobe: replace fmt callback with str callback.
...
Having a string callback is much more simpler than a variable args
one for writers to deal with, especially when dealing with escaping.
This patch also introduces a local fast_asprintf() function which is
similar to av_asprintf() but avoids reallocating at each print (leading
to a performance issue).
13 years ago
Michael Niedermayer
e29d6db55b
Merge avconv.texi in ffmpeg.texi
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Ronald S. Bultje
e0c3e07387
sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
...
Speed: from 3.9x to 9.6x speed improvement over C, and some small
(up to 15%) speed improvements over existing MMX code (particularly
for bigger filters).
13 years ago
Michael Niedermayer
9331a2ee41
configure: slightly more robust looking check for math functions.
...
I dont know on which system the prior check failed but an advanced
linker on some platform might have optimized func() out as unreachable.
Patch taken from http://floss.freebox.fr
Author: unknown
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
8f5bb35f40
ffmpeg: fix video synchronization code to be exact on constant fps videos. Fixes Ticket137
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Justin Ruggles
3ed7860943
include stdint.h in adpcm_data.h
...
fixes make checkheaders
13 years ago
Diego Biurrun
a05ea77c9f
mpeg12: reorder functions to avoid ugly forward declarations
13 years ago
Michael Niedermayer
fbbe092568
ffplay: remove thread command line option code, it is unneeded for -threads X to work.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
838e36635a
avcodec: move "thread emulation" warning to common code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
391b1e3911
Fix false positive when detecting dxva2.
13 years ago
Michael Niedermayer
38670356f9
libavformat/utils: print ts in the "invalid dts/pts combination" case.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
39e0accb7a
vf_remove_logo: domt access vf->next->query_format() directly but use the API.
...
This fixes a crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
d67e74929c
smacker: fix a few off by 1 errors
...
stereo & 16bit is untested due to lack of samples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Joakim Plate
32c0c562e7
dvdsubdec: Move colormap and alpha to context
...
This makes it rememember old values should the stream not
contain new values for these for each subtitle.
13 years ago
Michael Niedermayer
f98edc73c5
smacker: add forgotten *
...
found by fenrir
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Laurent Aimar
a92d0fa5d2
Fixed off by one packet size allocation in the smacker demuxer.
...
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Laurent Aimar
e055932f56
Check for invalid packet size in the smacker demuxer.
...
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Andrew Wason
5e85fd9f9c
libx264: fix overwriting presets with flags2
...
This fixes overwriting x264 preset settings for flags2 based options.
See https://ffmpeg.org/trac/ffmpeg/ticket/448
13 years ago
Joakim Plate
6c9a24636b
asf: only try to read asf index once
...
This avoid retrying to read ASF index in files for every
attempt to seek. This makes a big difference to protocols
with slow seeking (for example http)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Stefano Sabatini
9efae6a161
lavfi: bump minor and update APIchanges after recent updates
...
These changes were forgotten in commits:
lavfi: simplify signature for avfilter_get_audio_buffer() and friends
(commit 2c0317419b
)
and
lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps
(commit 4381bddc9f
)
13 years ago
Laurent Aimar
c58d45e004
segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Laurent Aimar
7cbe025758
segafilm: Check for memory allocation failures in segafilm demuxer.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Andrew Wason
3eb1e65f5f
libx264: fix overwriting preset rc_lookahead
...
This fixes https://ffmpeg.org/trac/ffmpeg/ticket/448 - at least for
rc_lookahead. A similar problem still exists for the flags2 based
options.
13 years ago
Joakim Plate
7009b96511
dvdsubdec: Support palette information for vobsub's stored as text in extradata
...
This is how mkv's store palette information for vobsubs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago