7f7080dc73
avformat: add av_stream_get_end_pts()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 18:53:12 +02:00
91a8262b9d
avcodec/utils: add error message for the recode_subtitle() without iconv case
...
Based on the assert command which was removed in ef0c466a0f
2014-05-21 17:39:26 +02:00
ef0c466a0f
Replace assert with AVERROR when recode_subtitle called w/o ICONV.
...
recode_subtitle() is called implicitly by avformat_find_stream_info().
As such, clients which disable ICONV always crash if a file contains
subtitles; even if they don't care about them.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 17:33:21 +02:00
e61055fd8b
avcodec/atrac3plusdec: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 16:03:22 +02:00
606a49d2e6
avcodec/atrac3: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 15:59:56 +02:00
f0211f4189
ffprobe: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 15:59:22 +02:00
3d4e365073
avcodec/x86/hpeldsp_init: remove redundant if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 13:38:27 +02:00
cd9e08e110
hpeldsp: fix build without inline asm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 13:37:38 +02:00
d1a32c3f49
x86: kill fpel_mmx.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 03:25:08 +02:00
19e66c7232
avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-21 03:02:06 +02:00
ca2fd25988
Fix compilation errors when deprecated features are disabled.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 22:55:28 +02:00
be656c362d
avcodec/h264_picture: Fix build without error resilience
...
Found-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 21:31:40 +02:00
c9ab879011
Fix build with --enable-ladspa --disable-frei0r.
...
https://bugs.gentoo.org/show_bug.cgi?id=510516
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 21:13:50 +02:00
2491579d47
configure: arm: do not enable fast-unaligned if it is explicitly disabled via commandline
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 15:29:57 +02:00
6310eb8010
avutil/cpu: force mmx on selection of higher x86 SIMD features
...
Fixes various runtime failures with manually set flags that represent no
existing CPU
Fixes Ticket3653
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 06:10:59 +02:00
e50ae60d46
avcodec/fate-idct8x8: Defined behavior: eliminate negative left-shifts.
...
The original code left-shifts negative values, which is undefined
in the C99 specification (the one used during normal FFmpeg compilation).
This change multiplies by (1 << shift), which is functionally equivalent,
but has defined behavior.
With this change, fate-idct8x8 compiled with --fsanitize=undefined works.
Bug-Id: 686
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
The assembly generated by gcc is unchanged by this commit
2014-05-20 04:21:06 +02:00
7d25af1547
Merge commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37'
...
* commit 'c23c96b638cbf6c489fd301e6b3d5555632fba37':
lavf: add av_stream_get_side_data
Conflicts:
doc/APIchanges
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 03:39:04 +02:00
9e6769d2dc
Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'
...
* commit 'afe176265480880e1f702c96a8ba434b0d88728b':
build: export library dependencies in ${name}_FFLIBS
Conflicts:
common.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 03:33:30 +02:00
447b988b53
Merge commit '132a5711a2aaaa6c7d139a0a30046a6ad41b64aa'
...
* commit '132a5711a2aaaa6c7d139a0a30046a6ad41b64aa':
check: add libavcodec/vda_internal.h to SKIPHEADERS-$(CONFIG_VDA)
See: beeb7551d6
2014-05-20 03:26:57 +02:00
9893e883ea
avformat/mux: Remove localized encoder strings
...
Fixes muxing to end up with a encoder=Lavf... and encoder_eng=somethingelse
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 02:46:42 +02:00
8408720453
avcodec/smvjpegdec: Dont ignore avcodec_close() return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 02:21:07 +02:00
0739614c9c
avcodec: remove no longer needed ff_codec_close_recursive()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 02:20:30 +02:00
be2bbc5266
ffmpeg_opt: dont copy "encoder" metadata unless stream copy is used
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 02:01:18 +02:00
b2a8bc3d04
ffmpeg/set_encoder_id: dont allocate encoder string if one is already set
...
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 00:51:47 +02:00
c23c96b638
lavf: add av_stream_get_side_data
2014-05-20 00:43:52 +02:00
afe1762654
build: export library dependencies in ${name}_FFLIBS
...
Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the
top-level MAkefile.
2014-05-20 00:43:51 +02:00
132a5711a2
check: add libavcodec/vda_internal.h to SKIPHEADERS-$(CONFIG_VDA)
2014-05-20 00:43:51 +02:00
6218831844
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavf/ftp: favour EPSV over PASV command
lavf/audiointerleave: return more meaningful error codes
lavf/audiointerleave: check for allocation failure
lavf/audiointerleave: use av_fifo_alloc_array
lavf/dvenc: use av_fifo_alloc_array
lavc/flac_parser: use av_fifo_alloc_array
lavc/frame_thread_encoder: use av_fifo_alloc_array
lavfi/vf_fps: use av_fifo_alloc_array
lavfi/buffersink: use av_fifo_alloc_array
ffmpeg: use av_fifo_alloc_array
lavd/jack_audio: use av_fifo_alloc_array
lavu/fifo: add av_fifo_alloc_array function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 00:22:51 +02:00
ab6228316a
avcodec/dvdsubenc: accept forced flag
...
Reviewed-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-20 00:08:08 +02:00
b9419b5882
lavf/ftp: favour EPSV over PASV command
...
EPSV is newer version of PASV and allows to use IPv6.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:45 +02:00
37fa4b9bb9
lavf/audiointerleave: return more meaningful error codes
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:45 +02:00
2ed9e17ed1
lavf/audiointerleave: check for allocation failure
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:45 +02:00
c61cdefa4d
lavf/audiointerleave: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:45 +02:00
74f9c5947d
lavf/dvenc: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:45 +02:00
8aa2988036
lavc/flac_parser: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:45 +02:00
bc4f362c92
lavc/frame_thread_encoder: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:45 +02:00
ce051ceefc
lavfi/vf_fps: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
d15db8e413
lavfi/buffersink: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
4d686674b2
ffmpeg: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
51bad41a13
lavd/jack_audio: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
7336e39f3c
lavu/fifo: add av_fifo_alloc_array function
...
Allows to alloc fifo buffer by passing
number of elements and size of element.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
d43c303038
x86/hevc_deblock: use constants instead of generating values at runtime
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 23:09:33 +02:00
41b928c5fa
avcodec/ppc/asm: fix build with ABI v2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 22:10:01 +02:00
b82274487b
lavc: define STRIDE_ALIGN as 32 when compiling with AVX support
...
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 22:09:43 +02:00
833ec9177d
ffmpeg/do_video_stats: fix used timebase
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 20:54:27 +02:00
55fe1582cb
avcodec/pthread_frame: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 19:36:29 +02:00
cd7ae5af16
Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'
...
* commit '82fc9f4b38244236a6ca7f946662ca653044a04c':
display: Include mathematics.h for fallback definition of NAN
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 19:28:29 +02:00
07941c2cb2
Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'
...
* commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043':
mov: store display matrix in a stream side data
Conflicts:
libavformat/isom.h
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 19:21:53 +02:00
ef1d4ee2f8
Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'
...
* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
Add transformation matrix API.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 19:12:30 +02:00
af72f62d7b
Merge commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83'
...
* commit '9929b3564c0dca42ed7baa6798ef15b6f0013c83':
pthread_frame: simplify the code by using new AVPacket API
Conflicts:
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 19:02:36 +02:00
Michael Niedermayer
Dale Curtis
Hendrik Leppkes
Christophe Gisquet
Alexis Ballier
Yu Xiaolei
Katerina Barone-Adesi
Janne Grunau
Oliver Fromme
Lukasz Marek
James Almer
Thierry FAUCK