OSDN Git Service
Michael Niedermayer [Wed, 17 Oct 2012 23:56:48 +0000 (01:56 +0200)]
cmdutils: apply option to codec and format contexts if possible.
This is needed for setting both contexts -err_detect at once.
Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Sat, 30 Jun 2012 15:53:38 +0000 (17:53 +0200)]
lavf/aiffdec: don't stop parsing after SSND chunk
Some file has ID3 chunk placed after SSND.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Mon, 22 Oct 2012 17:08:26 +0000 (19:08 +0200)]
dv: fix a check on dv_extract_timecode return value
Fixes CID733808
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Oct 2012 15:58:33 +0000 (17:58 +0200)]
ffmpeg/lavc: move experimental warnings to libavcodec.
This way they are available to all applications and not just ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Oct 2012 12:50:00 +0000 (14:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
riff: remove a write-only variable
lavc: extend frame_size doxy.
alacdec: set bits_per_raw_sample
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Oct 2012 12:39:12 +0000 (14:39 +0200)]
Merge commit '
c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'
* commit '
c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4':
rtpdec: Don't pass a non-AVClass pointer as log context
rtsp: Update a comment to the current filename scheme
avcodec: handle AVERROR_EXPERIMENTAL
avutil: Add AVERROR_EXPERIMENTAL
avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/utils.c
libavformat/rtpdec.c
libavutil/error.c
libavutil/error.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Oct 2012 11:58:19 +0000 (13:58 +0200)]
ffmpeg: fix negative array index
Fixes CID733808
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Oct 2012 11:12:15 +0000 (13:12 +0200)]
vf_aspect: unbreak avoption system
This fixes ff* -h infinite looping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 16 Oct 2012 16:10:59 +0000 (18:10 +0200)]
lavfi/aspect: add max option
Stefano Sabatini [Tue, 24 Jan 2012 22:20:23 +0000 (23:20 +0100)]
lavfi/aspect: extend syntax for the setdar and setsar filters
Add support for named options, and deprecate old "num:den" ambiguous
syntax.
Stefano Sabatini [Mon, 22 Oct 2012 08:24:04 +0000 (10:24 +0200)]
lavu/parseutils: remove unused gcd variable in av_parse_ratio()
Fix warning.
Paul B Mahol [Sat, 20 Oct 2012 22:16:13 +0000 (22:16 +0000)]
lavf/flacenc: disallow creation of invalid files with -c copy
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Wed, 17 Oct 2012 04:39:13 +0000 (06:39 +0200)]
riff: remove a write-only variable
Anton Khirnov [Wed, 17 Oct 2012 05:17:24 +0000 (07:17 +0200)]
lavc: extend frame_size doxy.
Justin Ruggles [Sun, 21 Oct 2012 23:18:07 +0000 (19:18 -0400)]
alacdec: set bits_per_raw_sample
Martin Storsjö [Sat, 20 Oct 2012 20:29:15 +0000 (23:29 +0300)]
rtpdec: Don't pass a non-AVClass pointer as log context
The log context is assumed to start with an AVClass pointer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 20 Oct 2012 20:04:14 +0000 (23:04 +0300)]
rtsp: Update a comment to the current filename scheme
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 21 Oct 2012 22:05:14 +0000 (00:05 +0200)]
fate: fix fate-filter-metadata-scenedetect
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 21:52:54 +0000 (23:52 +0200)]
avfilter_graph_parse: add support for parsing sws_flags
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 21:13:53 +0000 (23:13 +0200)]
Fix various uses of av_log_missing_feature()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nathan Caldwell [Fri, 19 Oct 2012 04:58:25 +0000 (22:58 -0600)]
avcodec: handle AVERROR_EXPERIMENTAL
Error out on init if a codec with CODEC_CAP_EXPERIMENTAL is requested
and strict_std_compliance is not FF_COMPLIANCE_EXPERIMENTAL.
Move the check from avconv to avcodec_open2() and return
AVERROR_EXPERIMENTAL accordingly.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Nathan Caldwell [Fri, 19 Oct 2012 04:59:04 +0000 (22:59 -0600)]
avutil: Add AVERROR_EXPERIMENTAL
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Nathan Caldwell [Thu, 18 Oct 2012 20:47:38 +0000 (14:47 -0600)]
avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stefano Sabatini [Wed, 17 Oct 2012 08:14:15 +0000 (10:14 +0200)]
lavfi/avfiltergraph: avoid to print "(null)" in the scale args
Fix parsing.
Stefano Sabatini [Mon, 15 Oct 2012 08:18:13 +0000 (10:18 +0200)]
lavfi/graphparser: fix parsing error in case of NULL sws_opts addition
If sws_opts was NULL it was resulting in the args being set to
"W:H:(null)", which with the new parsing code was generating a syntax
failure.
Stefano Sabatini [Sat, 20 Oct 2012 12:50:10 +0000 (14:50 +0200)]
lavc/utils: provide more feedback in case of experimental codec
Michael Niedermayer [Sun, 21 Oct 2012 18:48:21 +0000 (20:48 +0200)]
mpegaudiodec: Fix buffer handling on random access
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 21 Oct 2012 13:21:21 +0000 (15:21 +0200)]
doc/muxers: document mov faststart option.
Clément Bœsch [Sun, 21 Oct 2012 18:10:37 +0000 (20:10 +0200)]
fate: fix filter metadata dependency to ffprobe.
Carl Eugen Hoyos [Sun, 21 Oct 2012 17:30:43 +0000 (19:30 +0200)]
Improve MPEG-PS-in-MOV detection.
Fixes issue 1520.
Michael Niedermayer [Sun, 21 Oct 2012 16:56:50 +0000 (18:56 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: if there is no audio stream, use external clock by default
ffplay: use get_master_sync_type where necessary
ffplay: add get_master_sync_type function
ffplay: only check external clock if current frame serial matches the displayed frame serial
ffplay: add serial field to PacketQueue entry and populate it
ffplay: fix external time sync mode
ffplay: initialize audio and video pts drift
ffplay: fix nosync threshold check in synchronize_audio
ffplay: use framedrop by default when sync is not done to video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 14 Oct 2012 17:17:22 +0000 (19:17 +0200)]
h264: add support for AFD detection
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Kieran Kunhya <kierank@ob-encoder.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 15:37:15 +0000 (17:37 +0200)]
libavformat/oggenc: add {} to complex ifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 15:36:53 +0000 (17:36 +0200)]
libavformat/mxfenc: add {} to complex ifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 15:36:22 +0000 (17:36 +0200)]
libavformat/mpegvideodec: add {} to complex ifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 15:35:54 +0000 (17:35 +0200)]
libavformat/movenc: add {} to complex ifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 15:35:32 +0000 (17:35 +0200)]
bavformat/mov: add {} to complex ifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 15:35:08 +0000 (17:35 +0200)]
libavcodec/vorbisenc: add {} to complex ifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 15:34:45 +0000 (17:34 +0200)]
libavcodec/cook: add {} to complex ifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 15:34:14 +0000 (17:34 +0200)]
compat/getopt: add {} to complex ifs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 9 Oct 2012 21:01:31 +0000 (23:01 +0200)]
lavfi/silencedetect: export silence info to metadata.
Clément Bœsch [Tue, 9 Oct 2012 22:36:19 +0000 (00:36 +0200)]
lavfi/select: store scene score in buf ref metadata.
Clément Bœsch [Tue, 16 Oct 2012 21:49:03 +0000 (23:49 +0200)]
lavc: add lavfi metadata support.
This commit introduces a new AVPacket side data type:
AV_PKT_DATA_STRINGS_METADATA. Its main goal is to provide a way to
transmit the metadata from the AVFilterBufferRef up to the AVFrame. This
is at the moment "only" useful for lavfi input from libavdevice:
lavd/lavfi only outputs packets, and the metadata from the buffer ref
kept in its context needs to be transmitted from the packet to the frame
by the decoders. The buffer ref can be destroyed at any time (along with
the metadata), and a duplication of the AVPacket needs to duplicate the
metadata as well, so the choice of using the side data to store them was
selected.
Making sure lavd/lavfi raises the metadata is useful to allow tools like
ffprobe to access the filters metadata (it is at the moment the only
way); ffprobe will now automatically show the AVFrame metadata in any
customizable output format for users. API users will also be able to
access the AVFrame->metadata pointer the same way ffprobe does
(av_frame_get_metadata).
All the changes are done in this single commit to avoid some memory
leaks: for instances, the changes in lavfi/avcodec.c are meant to
duplicate the metadata from the buffer ref into the AVFrame. Unless we
have an internal way of freeing the AVFrame->metadata automatically, it
will leak in most of the user apps. To fix this problem, we introduce
AVCodecContext->metadata and link avctx->metadata to the current
frame->metadata and free it at each decode frame call (and in the codec
closing callback for the last one). But doing this also means to update
the way the tiff decoder already handles the AVFrame->metadata (it's the
only one decoder with frame metadata at the moment), by making sure it
is not trying to free a pointer already freed by the lavc internals.
The lavfi/avcodec.c buffer ref code is based on an old Thomas Kühnel
work, the rest of the code belongs to the commit author.
Signed-off-by: Thomas Kühnel <kuehnelth@googlemail.com>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Marton Balint [Sat, 13 Oct 2012 22:47:15 +0000 (00:47 +0200)]
ffplay: if there is no audio stream, use external clock by default
Otherwise playing the video could be much slower than realtime if the system
can't decode or display the frames fast enough.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 13 Oct 2012 20:31:17 +0000 (22:31 +0200)]
ffplay: use get_master_sync_type where necessary
We should make decisions based on the real sync type. This also simplifies
the code.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 13 Oct 2012 19:33:32 +0000 (21:33 +0200)]
ffplay: add get_master_sync_type function
The real av_sync_type may be different to VideoState->av_sync_type, because the
required audio or video stream for audio or video clock may not be available.
We will use a function to query the real av_sync_type which is used for
determining the master clock.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 14 Oct 2012 16:21:40 +0000 (18:21 +0200)]
ffplay: only check external clock if current frame serial matches the displayed frame serial
This way we avoid updating the external clocks with timestamps beloging to
frames before seek.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 14 Oct 2012 15:56:32 +0000 (17:56 +0200)]
ffplay: add serial field to PacketQueue entry and populate it
The purpose of the serial field is to accompany the decoded data during the
decoding process to know if the decoded data belongs to the data stream after
the latest packet queue flush.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 6 Oct 2012 21:55:29 +0000 (23:55 +0200)]
ffplay: fix external time sync mode
We now initalize the external clock to 0 and, we use the system clock to
regulate the timings of audio and video in external clock sync mode. We
recover from external clock sync loss, when the delay to external clock is
bigger than AV_NOSYNC_THRESHOLD.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 6 Oct 2012 17:42:42 +0000 (19:42 +0200)]
ffplay: initialize audio and video pts drift
This makes sensible audio and video clock values even before displaying the
first frame.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 6 Oct 2012 11:31:07 +0000 (13:31 +0200)]
ffplay: fix nosync threshold check in synchronize_audio
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Thu, 4 Oct 2012 23:20:55 +0000 (01:20 +0200)]
ffplay: use framedrop by default when sync is not done to video
When using external sync, framedrop is perfectly fine.
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Sun, 21 Oct 2012 15:09:36 +0000 (17:09 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: adpcm: cosmetics: Sort test entries
fate: adpcm: Add dependencies
svq3: cosmetics: Drop useless parentheses
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 14:32:41 +0000 (16:32 +0200)]
Merge commit '
a7d2861d36756b913e85681b86ed3385274e8ced'
* commit '
a7d2861d36756b913e85681b86ed3385274e8ced':
svq3: K&R formatting cosmetics
fate: Introduce ENCMUX macro for tests that require encoders and a muxer
ffv1: Add missing #includes to header file
Conflicts:
libavcodec/ffv1.h
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 14:03:31 +0000 (16:03 +0200)]
Merge commit '
2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'
* commit '
2d09b36c0379fcda8f984bc8ad8816c8326fd7bd':
doc/platform: Add info on shared builds with MSVC
doc/platform: Move a caveat down to the notes section
ARM: reinstate optimised intmath.h
ffv1: update to ffv1 version 3
Conflicts:
doc/platform.texi
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 12:54:16 +0000 (14:54 +0200)]
Merge commit '
4a2a4524a3f50ed302820ba971ddd48e78c7436f'
* commit '
4a2a4524a3f50ed302820ba971ddd48e78c7436f':
ffv1: propagate errors
Conflicts:
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 12:35:47 +0000 (14:35 +0200)]
Merge commit '
71f7b22dba60524b2285643ae0b49d8f64977129'
* commit '
71f7b22dba60524b2285643ae0b49d8f64977129':
ffv1: split decoder and encoder
Conflicts:
libavcodec/Makefile
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 12:05:46 +0000 (14:05 +0200)]
ffv1: split decoder and encoder
This is not based on lucas work due to code divergence (its less work this way
than trying to merge from a split based on 2 years outdated code)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 11:29:03 +0000 (13:29 +0200)]
Merge commit '
d15c21e5fa3961f10026da1a3080a3aa3cf4cec9'
* commit '
d15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
avutil: make some tables visible again
avutil: remove inline av_log2 from public API
celp_math: rename ff_log2 to ff_log2_q15
Conflicts:
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 02:25:30 +0000 (04:25 +0200)]
ffv1: fix gray
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Oct 2012 00:42:16 +0000 (02:42 +0200)]
mp3demux: Rewrite xing TOC based seeking
The libav code depends on mp3 startcodes only occuring at the start of
frames. But there is nothing in mp3 that prevents them occuring elsewhere
by chance. Thus the code would fail randomly, the new code searches for 3
consecutive valid frames. If this turns out to be still insufficient the
number can be raised further, or additional checks added.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 23:31:53 +0000 (01:31 +0200)]
mp3dec: propagate error code correctly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 20 Oct 2012 23:28:19 +0000 (01:28 +0200)]
lavfi/silencedetect: increase duration precision.
This should also fix CID717889.
Clément Bœsch [Sat, 20 Oct 2012 23:16:49 +0000 (01:16 +0200)]
lavf/webvttdec: fix potential timing overflows.
Should fix CID733781 and CID733782.
Clément Bœsch [Sat, 20 Oct 2012 23:08:17 +0000 (01:08 +0200)]
lavf/subviewerdec: fix potential timing overflows.
Should fix CID733779 and CID733780.
Michael Niedermayer [Sat, 20 Oct 2012 21:31:32 +0000 (23:31 +0200)]
udp: add missing mutex unlock
Fixes CID703688
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 21:07:16 +0000 (23:07 +0200)]
rtpdec: check av_new_packet() return value
Fixes CID733715
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 20:57:30 +0000 (22:57 +0200)]
rtmp_write_amf_data: remove dead code
Fixes CID732199
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 20:34:01 +0000 (22:34 +0200)]
riff_has_valid_tags: remove unused variable
Fixes CID739471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 19 Oct 2012 21:32:12 +0000 (23:32 +0200)]
fate: adpcm: cosmetics: Sort test entries
This also places tests of related formats together.
Diego Biurrun [Fri, 19 Oct 2012 16:03:10 +0000 (18:03 +0200)]
svq3: K&R formatting cosmetics
Diego Biurrun [Fri, 19 Oct 2012 23:13:56 +0000 (01:13 +0200)]
fate: adpcm: Add dependencies
Diego Biurrun [Sat, 20 Oct 2012 13:40:15 +0000 (15:40 +0200)]
fate: Introduce ENCMUX macro for tests that require encoders and a muxer
Diego Biurrun [Fri, 19 Oct 2012 16:26:54 +0000 (18:26 +0200)]
svq3: cosmetics: Drop useless parentheses
Diego Biurrun [Sat, 20 Oct 2012 19:09:25 +0000 (21:09 +0200)]
ffv1: Add missing #includes to header file
Michael Niedermayer [Sat, 20 Oct 2012 18:45:32 +0000 (20:45 +0200)]
nutdec: fix integer overflow
Fixes CID700575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 18:12:13 +0000 (20:12 +0200)]
nsvdec: fix division by 0
Fixes CID717749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 17:48:26 +0000 (19:48 +0200)]
avformat_free_context: allow NULL as argument
Fixes CID703682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 17:08:41 +0000 (19:08 +0200)]
mmsh: fix integer overflow in mmsh_seek()
Fixes CID703745
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 20 Oct 2012 09:07:16 +0000 (11:07 +0200)]
examples/decoding_encoding: prefer 'frame' over 'picture' for an AVFrame
Decrease confusion.
Michael Niedermayer [Sat, 20 Oct 2012 16:47:44 +0000 (18:47 +0200)]
matroskaenc: Fix hypothetical integer overflows
Fixes CID700562-7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 16:38:36 +0000 (18:38 +0200)]
matroskaenc: check avio_open_dyn_buf() retuen code
Fixes CID703629
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Fri, 19 Oct 2012 19:12:07 +0000 (15:12 -0400)]
doc/platform: Add info on shared builds with MSVC
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 19 Oct 2012 18:19:26 +0000 (14:19 -0400)]
doc/platform: Move a caveat down to the notes section
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 19 Oct 2012 19:12:07 +0000 (15:12 -0400)]
doc/platform: Add info on shared builds with MSVC
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Fri, 19 Oct 2012 18:19:26 +0000 (14:19 -0400)]
doc/platform: Move a caveat down to the notes section
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Mans Rullgard [Sat, 20 Oct 2012 14:29:32 +0000 (15:29 +0100)]
ARM: reinstate optimised intmath.h
Use of the ARM optimised intmath.h was accidentally dropped in
9734b8b.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Luca Barbato [Fri, 19 Oct 2012 10:14:22 +0000 (12:14 +0200)]
ffv1: update to ffv1 version 3
Based on code from Carl Eugen Hoyos, Michael Niedermayer and Paul B Mahol.
Luca Barbato [Fri, 19 Oct 2012 08:33:43 +0000 (10:33 +0200)]
ffv1: propagate errors
Luca Barbato [Fri, 19 Oct 2012 08:19:36 +0000 (10:19 +0200)]
ffv1: split decoder and encoder
Hendrik Leppkes [Sat, 20 Oct 2012 04:43:48 +0000 (06:43 +0200)]
Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 14:58:33 +0000 (16:58 +0200)]
matroskadec: fix double negation typo
Fixes CID602563
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 14:55:45 +0000 (16:55 +0200)]
matroska_parse_rm_audio: check for malloc failure
Fixes CID733712
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 13:32:59 +0000 (15:32 +0200)]
bgmc: check the correct pointers
Fixes CID90539, CID90538
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Oct 2012 11:59:53 +0000 (13:59 +0200)]
lavc: revert broken hunk from
1cd9c81ddb317ca00061d11d3562d3a34888d91b
This should fix fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 20 Oct 2012 10:32:01 +0000 (13:32 +0300)]
avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
Earlier versions of for instance of libavcodec expect this symbol to be
present in libavutil. This commit can be reverted after the next major
bump.
New shared builds of avcodec will link to the internal copy of the
table within that library, so those builds won't rely on this table
being present in avutil any longer either.
Signed-off-by: Martin Storsjö <martin@martin.st>
Reinhard Tartler [Fri, 19 Oct 2012 21:34:02 +0000 (23:34 +0200)]
avutil: make some tables visible again
These tables are used for instance by older versions of libavcodec and
need to remain visible until the next SONAME bump.
Signed-off-by: Martin Storsjö <martin@martin.st>
Mans Rullgard [Thu, 18 Oct 2012 17:15:38 +0000 (18:15 +0100)]
avutil: remove inline av_log2 from public API
This removes inline av_log2 and av_log2_16bit from the public API,
instead exporting them as regular functions. In-tree code still
gets the inline and otherwise optimised variants.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 18 Oct 2012 16:59:13 +0000 (17:59 +0100)]
celp_math: rename ff_log2 to ff_log2_q15
This name is more descriptive as the function returns a fixed-point
value with 15 fraction bits.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sat, 20 Oct 2012 11:18:59 +0000 (13:18 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Group math functions into a separate variable
avutil/mem: K&R formatting cosmetics
avutil/lzo: K&R formatting cosmetics
Conflicts:
configure
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>