OSDN Git Service
Nicholas Robbins [Sat, 20 Sep 2014 11:53:44 +0000 (07:53 -0400)]
libavcodec/dvdsubdec: Add option forced_subs_only to only decode forced subtitle frames.
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Sep 2014 16:53:44 +0000 (18:53 +0200)]
avformat/asfenc: Make asf_write_indexs index argument const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Sep 2014 16:47:14 +0000 (18:47 +0200)]
avformat/adtsenc: buf isnt changed in adts_decode_extradata(), make it const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Sep 2014 16:09:28 +0000 (18:09 +0200)]
avcodec/4xm: Make src of decode_p_block() const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Sep 2014 16:06:56 +0000 (18:06 +0200)]
avcodec/snow: Make block argumrnt of ff_snow_pred_block() const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Sep 2014 15:49:55 +0000 (17:49 +0200)]
postproc/postprocess_template: mark unchanged function arguments const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Sep 2014 15:42:10 +0000 (17:42 +0200)]
postprocess: prefetch* dont change anything, thus their arguments should be const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Sep 2014 15:05:55 +0000 (17:05 +0200)]
Revert "configure: Refactor setting of feature test macro _XOPEN_SOURCE"
This fixes build on netbsd and probably other bsd based Platforms
This reverts commit
56b8d106769c5c5f9174dcc426f1ee2f991428b1.
Thomas Volkert [Mon, 22 Sep 2014 11:07:10 +0000 (13:07 +0200)]
Add missing entry for maintainer of rtpenc_hevc.*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Mon, 22 Sep 2014 07:57:37 +0000 (09:57 +0200)]
avformat/avidec: ensure that palette does not contain the BottomUp info.
Considering the palette is located at the end of extradata may be flawed
when the extradata contains the palette followed by the BottomUp field.
When the BottomUp field is present, exclude it from the palette.
Fixes part of ticket #1304
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 12 Sep 2014 14:37:26 +0000 (16:37 +0200)]
avformat/img2: remove useless 'pix' duplicated entry.
The second entry will never be selected, so let's save some bytes in the
library.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Volkert [Sun, 21 Sep 2014 15:43:16 +0000 (17:43 +0200)]
rtpenc_h263_rfc2190: avoid misleading error output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 22 Sep 2014 01:25:22 +0000 (03:25 +0200)]
avdevice/version: bump minor for the decklink input
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Deti Fliegl [Mon, 22 Sep 2014 00:46:03 +0000 (02:46 +0200)]
avdevice: add decklink input support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Deti Fliegl [Sun, 21 Sep 2014 23:39:50 +0000 (01:39 +0200)]
avdevice/decklink: move general code of decklink encoder to common file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jörg Krause [Sun, 21 Sep 2014 20:48:01 +0000 (22:48 +0200)]
configure: Refactor setting of feature test macro _XOPEN_SOURCE
Some C libraries, eg glibc, uclibc, and musl, uses feature test macros
to expose definitions conforming to the standards ISO C, POSIX and
extensions. According to which feature test macros are defined by the
user or the compiler, a header file, eg <features.h>, used by these
libraries internally defines various other macros.
glibc and uclibc also defines release test macros, eg __GLIBC__ and
__UCLIBC__ in <features.h>. musl does not have (and does not want) a
macro __MUSL__. Therefore it is not possible to check for the musl
library.
However, building FFmpeg with musl needs the feature test macro
_XOPEN_SOURCE=600 to be defined.
Signed-off-by: Jörg Krause <jkrause@posteo.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sun, 21 Sep 2014 17:03:33 +0000 (19:03 +0200)]
lavu/bprint: add const to av_bprint_is_complete() argument.
Clément Bœsch [Sat, 20 Sep 2014 16:39:58 +0000 (18:39 +0200)]
avformat/assenc: mux all extradata at once
Before this commit, the code was muxing up to the 2nd line after
"[Events]" (assuming it to be the "Format:" line). The remaining are
generally "Comment:" directives which can stay in that place. mkvextract
behaves that way so it seems there is no reason for that extra
complexity.
Clément Bœsch [Sat, 20 Sep 2014 19:39:57 +0000 (21:39 +0200)]
avformat/assenc: return correct error code
Clément Bœsch [Sat, 20 Sep 2014 20:20:05 +0000 (22:20 +0200)]
avcodec/webvttdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:18:50 +0000 (22:18 +0200)]
avcodec/textdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:17:29 +0000 (22:17 +0200)]
avcodec/subviewerdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:14:11 +0000 (22:14 +0200)]
avcodec/srtdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:11:34 +0000 (22:11 +0200)]
avcodec/samidec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:11:45 +0000 (22:11 +0200)]
avcodec/realtextdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:02:26 +0000 (22:02 +0200)]
avcodec/mpl2dec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 20:00:21 +0000 (22:00 +0200)]
avcodec/movtextdec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 19:58:27 +0000 (21:58 +0200)]
avcodec/microdvddec: add some memory checks
Clément Bœsch [Sat, 20 Sep 2014 19:48:13 +0000 (21:48 +0200)]
avcodec/jacosubdec: add some memory checks
Clément Bœsch [Sun, 21 Sep 2014 16:36:11 +0000 (18:36 +0200)]
avcodec/ass: add ff_ass_add_rect_bprint() helper
Thomas Volkert [Sun, 21 Sep 2014 11:50:12 +0000 (13:50 +0200)]
rtpdec_hevc: do not print an error message if the received packet has a valid header but lacks additional bytes as payload
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Sun, 21 Sep 2014 10:51:41 +0000 (12:51 +0200)]
avformat/mp3dec: avoid early EOF with concatenated gapless mp3s
Consider a file created with something like:
cat file1.mp3 file2.mp3 > result.mp3
Then if file2.mp3 has gapless information, result.mp3 would stop playing
something in the middle. This happens because the gapless info directs
the decoder to discard all samples after a certain position. To make
matters worse, the gapless info of file2.mp3 will be used when playing
the file1.mp3 part, because the gapless info is located at the end of
the file.
While handling concatenated gapless files correctly would be insane and
a lot of effort (especially without scanning the whole file on opening),
it's easy to prevent at least early EOF. Playback will happen to work,
even if it's slightly broken.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sun, 21 Sep 2014 00:29:28 +0000 (02:29 +0200)]
mlpdec: support TrueHD streams with an Atmos substream
The fourth substream is being discarded, since its not raw audio data,
but an encoded Atmos stream which needs a specialized decoder.
Fixes decoding of the true hd stream from Transformers\ -\ Age\ of\ Extinction\ 2014\ 1080P-003.mkv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sun, 21 Sep 2014 00:29:27 +0000 (02:29 +0200)]
mlpdec: support major sync headers with optional extension blocks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thomas Volkert [Sun, 21 Sep 2014 10:10:42 +0000 (12:10 +0200)]
rtpenc: HEVC/H.265 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Sep 2014 10:12:50 +0000 (12:12 +0200)]
avfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples
Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Sep 2014 10:12:50 +0000 (12:12 +0200)]
swscale: Allow chroma samples to be above and to the left of luma samples
Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 21 Sep 2014 09:50:41 +0000 (11:50 +0200)]
Merge commit '
103391ca90b2f7c56ae756d76c76f7c3dfa28dd4'
* commit '
103391ca90b2f7c56ae756d76c76f7c3dfa28dd4':
dca: Remove some commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Sep 2014 21:54:00 +0000 (23:54 +0200)]
avcodec/alacenc: Remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 20 Sep 2014 18:23:09 +0000 (18:23 +0000)]
alacenc: remove unneeded masking
The extra bits have already been masked, so this was not doing anything.
Noticed-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sat, 20 Sep 2014 18:23:08 +0000 (18:23 +0000)]
alacenc: fix incorrect buffer use
The issue lies in actually dead code ("for now it's not used").
Noticed-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Sat, 20 Sep 2014 11:48:05 +0000 (13:48 +0200)]
avformat/mp3dec: fix gapless audio support
The code already had skipping of initial padding, but discarding
trailing frame padding was missing.
This is somewhat questionable, because it will make the decoder discard
any data after the declared file size in the LAME header. But note that
skipping full frames at the end of the stream is required. Encoders
actually create such files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Fri, 19 Sep 2014 22:21:12 +0000 (00:21 +0200)]
dca: Remove some commented-out cruft
Pascal Massimino [Fri, 19 Sep 2014 12:52:55 +0000 (05:52 -0700)]
avfilter/idet: typo fix: PROGRSSIVE -> PROGRESSIVE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 19 Sep 2014 22:16:45 +0000 (19:16 -0300)]
x86/me_cmp: port mmxext vsad functions to yasm
Also add mmxext versions of vsad8 and vsad_intra8, and sse2 versions of
vsad16 and vsad_intra16.
Since vsad8 and vsad16 are not bitexact, they are accordingly marked as
approximate.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 19 Sep 2014 21:46:06 +0000 (23:46 +0200)]
avcodec/dvdsubdec: fix VD/SD identifier name
Found-by: Nicholas Robbins <nickrobbins-at-yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Daniel Bomar [Fri, 19 Sep 2014 19:56:00 +0000 (14:56 -0500)]
avformat/os_support: Add _DEFAULT_SOURCE to hide warning about _SVID_SOURCE depreciation
As suggested, this just adds _DEFAULT_SOURCE while preserving
_SVID_SOURCE for whatever old systems still need it.
Signed-off-by: Daniel Bomar <dbdaniel42@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Sep 2014 17:05:02 +0000 (19:05 +0200)]
tests/utils: make arguments const that arent changed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 19 Sep 2014 04:44:42 +0000 (01:44 -0300)]
avcodec/dv_profile: deprecate internal function that shouldn't be public
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 19 Sep 2014 15:00:15 +0000 (17:00 +0200)]
postproc/postprocess: Avoid some ifs in do_a_deblock_C()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Pascal Massimino [Tue, 16 Sep 2014 15:01:07 +0000 (17:01 +0200)]
libavcodec/webp: treat out-of-bound palette index as translucent black
See https://code.google.com/p/webp/issues/detail?id=206
for a description of the problem/fix.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This patch makes the decoder follow the recommendation of the spec.
There is some disagreement (see "[FFmpeg-devel] [PATCH]: libavcodec/webp")
about what would be best to be written in the spec, so in case the spec
is changed again, this potentially would need to be amended or reverted
Gianluigi Tiesi [Fri, 19 Sep 2014 02:49:36 +0000 (04:49 +0200)]
avcodec/libilbc: support for latest git of libilbc
in the latest git commits of libilbc developers removed WebRtc_xxx typedefs
This commit uses int types instead,
it's safe to apply also for previous versions since
WebRtc_Word16 was always a typedef of int16_t and
WebRtc_UWord16 a typedef of uint16_t
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Sep 2014 00:52:14 +0000 (02:52 +0200)]
postproc: Replace CLIP by av_clip_uint8
drop "#define CLIP av_clip_uint8"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 19:11:37 +0000 (21:11 +0200)]
postproc/postprocess: remove redundant casts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 19:10:18 +0000 (21:10 +0200)]
postproc/postprocess: Use FF_ARRAY_ELEMS() in pp_free_context() instead of hard-coding their size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 19:08:44 +0000 (21:08 +0200)]
postproc/postprocess: Remove unused argument from reallocAlign()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 12:46:40 +0000 (14:46 +0200)]
Merge branch 'postprocwork'
* postprocwork:
postproc/postprocess: use av_strtok()
postprocess: make some variables in pp_get_mode_by_name_and_quality() const
postproc: simplify forwarding return codes
libpostproc/postprocess: avoid some if()
fate: add fate-filter-pp1
This is merged instead of just fast forward pushed due to a bug in the git hook
which does not allow commits to change filter-video.mak except merge commits.
filter-video.mak contains a few tabs, which are needed due to Makefile syntax
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 12:21:27 +0000 (14:21 +0200)]
postproc/postprocess: use av_strtok()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 12:19:08 +0000 (14:19 +0200)]
postprocess: make some variables in pp_get_mode_by_name_and_quality() const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 12:09:20 +0000 (14:09 +0200)]
postproc: simplify forwarding return codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 12:06:43 +0000 (14:06 +0200)]
libpostproc/postprocess: avoid some if()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Sep 2014 12:02:33 +0000 (14:02 +0200)]
fate: add fate-filter-pp1
This tests a few more filters with forced quantizers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 18 Sep 2014 00:45:38 +0000 (21:45 -0300)]
x86/me_cmp: combine sad functions into a single macro
No point in having the sad8 functions separate now that the loop is no
longer unrolled.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 18 Sep 2014 00:10:55 +0000 (02:10 +0200)]
Merge commit '
2bb2c2bd75e5f4b28a945511cda77e0a1a44c758'
* commit '
2bb2c2bd75e5f4b28a945511cda77e0a1a44c758':
rtpenc_chain: Pass the initial time_base hint on to the chained muxer
See: [FFmpeg-devel] [PATCH] avformat/rtpenc_chain: Set timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Sep 2014 23:41:43 +0000 (01:41 +0200)]
Merge commit '
3f2c70355ab722bc9f741bd3ed8224c7cfb62379'
* commit '
3f2c70355ab722bc9f741bd3ed8224c7cfb62379':
configure: Use the right variables in check_host_cpp
See:
453944cc77b9ea27c74011eb7c0e20c887b321cf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Wed, 17 Sep 2014 22:08:05 +0000 (00:08 +0200)]
vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion
The token 'vector' is a keyword in the Vector/SIMD Multimedia Extension data types and thus should not be used as a variable name.
This fixes building on powerpc/ppc64el.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vitor Sessak [Wed, 17 Sep 2014 19:10:16 +0000 (21:10 +0200)]
swscale/x86: do not expect registers to be preserved across inline ASM blocks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Sep 2014 21:36:53 +0000 (23:36 +0200)]
avcodec/x86/vp9lpf: Always include x86util.asm
Fixes executable stack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 17 Sep 2014 09:03:18 +0000 (12:03 +0300)]
rtpenc_chain: Pass the initial time_base hint on to the chained muxer
In practice this hint is ignored - the rtp muxer always overwrites
the stream time base without taking the hint into account. But as
a general practice this is the correct way to pass a time base hint
on to a chained muxer.
This avoids warnings about using the codec time base as hint
being deprecated.
Signed-off-by: Martin Storsjö <martin@martin.st>
Jörg Krause [Thu, 11 Sep 2014 11:55:48 +0000 (13:55 +0200)]
configure: Use the right variables in check_host_cpp
HOSTCPPFLAGS and HOSTCFLAGS are only set in config.mak.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 17 Sep 2014 18:38:56 +0000 (20:38 +0200)]
Merge commit '
c5560e72d0bb69f8a1ac9536570398f84388f396'
* commit '
c5560e72d0bb69f8a1ac9536570398f84388f396':
apetag: Fix APE tag size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Sep 2014 18:25:22 +0000 (20:25 +0200)]
fate: disable fate-ra4-288, the code uses floats and does not produce the same results on different platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Sep 2014 18:09:09 +0000 (20:09 +0200)]
Merge commit '
44caf99ecae7bc1b907fab849ecaa72dd340ba2e'
* commit '
44caf99ecae7bc1b907fab849ecaa72dd340ba2e':
fate: Add tests for RealAudio 1.0 (14.4) and RealAudio 2.0 (with 28.8)
Conflicts:
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 15 Sep 2014 00:31:12 +0000 (21:31 -0300)]
avfilter: remove obsolete FF_API_FILL_FRAME cruft
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Wed, 17 Sep 2014 17:59:10 +0000 (19:59 +0200)]
Merge commit '
2dd09ebf5597fd5e4a573bee9cccf21ae821f286'
* commit '
2dd09ebf5597fd5e4a573bee9cccf21ae821f286':
cmdutils: Print a more sensible message in show_filters() w/o libavfilter
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Katerina Barone-Adesi [Mon, 15 Sep 2014 23:40:24 +0000 (01:40 +0200)]
apetag: Fix APE tag size check
The size variable is (correctly) unsigned, but is passed to several functions
which take signed parameters, such as avio_read, sometimes after having
numbers added to it. So ensure that size remains within the bounds that
these functions can handle.
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Katerina Barone-Adesi [Mon, 21 Jul 2014 21:28:42 +0000 (23:28 +0200)]
fate: Add tests for RealAudio 1.0 (14.4) and RealAudio 2.0 (with 28.8)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Wed, 17 Sep 2014 11:37:34 +0000 (13:37 +0200)]
avcodec/x86/me_cmp: fix sad8xh
This adds back support for 8x4 and 8x16
it does not support 8x2, i think nothing uses that
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 17 Sep 2014 00:41:47 +0000 (21:41 -0300)]
x86/me_cmp: port mmxext and sse2 sad functions to yasm
Also add a missing c->pix_abs[0][0] initialization, and sse2 versions of
sad16_x2, sad16_y2 and sad16_xy2 (%15 to %20 faster than mmxext).
Since the _xy2 versions are not bitexact, they are accordingly marked as
approximate.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 17 Sep 2014 07:55:56 +0000 (07:55 +0000)]
doc/filters: remove aconvert
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Mon, 15 Sep 2014 01:46:18 +0000 (22:46 -0300)]
avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Wed, 17 Sep 2014 02:43:51 +0000 (04:43 +0200)]
ffplay: try to fix build failure on apple
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 17 Sep 2014 01:23:16 +0000 (03:23 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: use frame queue to determine last used pos
ffplay: factorize frame queue operations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 16 Sep 2014 22:38:08 +0000 (00:38 +0200)]
avformat/avienc: Dont search for startcodes in inserted empty avi frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Tue, 16 Sep 2014 02:07:09 +0000 (18:07 -0800)]
doc/filters: add geq gradient examples
Radial gradient by Víctor Paesa. Linear gradient by Paul Gentemann.
Also-by: Víctor Paesa <victorpaesa@googlemail.com>
Also-by: Paul Gentemann <beriukay@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
Michael Niedermayer [Tue, 16 Sep 2014 21:11:47 +0000 (23:11 +0200)]
Revert "avformat/rtpproto: fix strict aliasing violations with sockaddr"
It appears this breaks build with MSVC
until someone who has MSVC setup has time to investigate and
workaround/fix this, its better to revert so that build is not broken
Thats even more so as the original commit only fixed a hypothetical issue
This reverts commit
e587a428d75d58e2e5a592efd7bff44e1d9294ee.
Marton Balint [Sat, 24 May 2014 17:49:59 +0000 (19:49 +0200)]
ffplay: use frame queue to determine last used pos
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 2 Jul 2013 23:42:55 +0000 (01:42 +0200)]
ffplay: factorize frame queue operations
Create a generic frame and a frame queue struct to handle video picture queues
and subtitle picture queues with common code. Also add the possibility to queue
AVFrames, however at the moment we only use SDL_Overlay buffers for video and
AVSubtitles for subtitles.
Signed-off-by: Marton Balint <cus@passwd.hu>
Clément Bœsch [Thu, 11 Sep 2014 19:10:43 +0000 (21:10 +0200)]
avfilter/ass: add shaping option
The documentation is mostly based on ass.h public header.
Clément Bœsch [Thu, 11 Sep 2014 19:10:03 +0000 (21:10 +0200)]
avfilter/ass: better log level mapping
Clément Bœsch [Thu, 11 Sep 2014 19:09:39 +0000 (21:09 +0200)]
avfilter/ass: make sure the log level are in available range
Michael Niedermayer [Tue, 16 Sep 2014 18:31:02 +0000 (20:31 +0200)]
Merge commit '
45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'
* commit '
45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
dca: K&R formatting cosmetics
Conflicts:
libavcodec/dca_parser.c
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 16 Sep 2014 18:05:50 +0000 (20:05 +0200)]
Merge commit '
9030c58a780a02fb8256cb75cd39275eaad786d1'
* commit '
9030c58a780a02fb8256cb75cd39275eaad786d1':
configure: Disable i686 for i586 and lower CPUs
See:
cdb3eee7c496f763d195de34be7f67783b98fb2c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 2 Sep 2014 21:25:33 +0000 (23:25 +0200)]
cmdutils: Print a more sensible message in show_filters() w/o libavfilter
Also avoid an unused variable warning for compilers w/o av_unused support.
Michael Niedermayer [Tue, 16 Sep 2014 16:28:32 +0000 (18:28 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add a closing LF to Webm-manifest files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 16 Sep 2014 16:04:51 +0000 (18:04 +0200)]
tools/crypto_bench: fix build when AV_READ_TIME is unavailable
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 16 Sep 2014 15:24:56 +0000 (17:24 +0200)]
Add a closing LF to Webm-manifest files.
Fixes fate-webm-dash-manifest on AIX.
Reviewed-by: Nicolas George
Clément Bœsch [Tue, 16 Sep 2014 08:08:09 +0000 (10:08 +0200)]
sws: use av_clip() instead of av_clip_c()
Clément Bœsch [Tue, 16 Sep 2014 08:07:56 +0000 (10:07 +0200)]
avformat/flacenc: use av_clip() instead of av_clip_c()
Steven Liu [Fri, 12 Sep 2014 10:04:52 +0000 (18:04 +0800)]
lavf/hls: add hls_ts_option
Same as COMMITID
4f5493fe2380ad4aba67759baa7d7d4437f2e776.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>