Dave Rice
6d787aea96
doc/ffprobe.xsd: add build_date and build_time as optional attributes
...
This partly undoes 7b35a01
.
The intent of patch 7b35a01
was to no longer use build_date and
build_time as attributes of programVersion, but the patch also had the
effect of making all records generated with an earlier ffprobe build with
build_date and build_time as invalid.
This patch puts the two attributes back but without mandating their use,
thus older ffprobe records as backwards compatible with the current
schema and their use is no longer required.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-05-13 12:35:16 +02:00
Dave Rice
b0294f0cfb
doc/ffprobe.xsd: remove extra sequence from streamType
...
This makes the XSD valid again. Fixes a regression from a72b61a
.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-05-13 12:35:16 +02:00
Marton Balint
93cc5ca7ed
lavf/img2dec: add option to disable pattern matching
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-12 13:32:23 +02:00
Michael Niedermayer
541d75f9a0
avformat: add callback for opening further files
...
Previous version reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-11 21:55:18 +02:00
James Almer
28eaf46da9
doc/APIchanges: fill missing versions and hashes
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-07 18:56:26 -03:00
James Almer
e0a403e1c2
vp9: add missing changelog and APIchanges entries for new VP9 profiles
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-07 18:35:12 -03:00
Michael Niedermayer
a7dd933b81
avcodec: Add av_packet_side_data_name()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 21:01:37 +02:00
James Almer
079b7f6eac
vp9: add profile names
...
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-04 18:39:51 -03:00
Michael Niedermayer
a72b61a317
ffprobe: support printing AVStream and AVPacket side data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-03 00:53:19 +02:00
Michael Niedermayer
f5b26fbc2f
Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
...
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
avconv: Add an option for automatically rotating video according to display matrix
Conflicts:
Changelog
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 22:39:00 +02:00
Michael Niedermayer
deedf3e590
Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'
...
* commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37':
avplay: Add support for rotated video
Conflicts:
configure
doc/ffplay.texi
ffplay.c
See: 08c51e12b1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 22:31:20 +02:00
Michael Niedermayer
61b4ab1860
avfilter: Add cover_rect filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 21:15:48 +02:00
Michael Niedermayer
94340e4b28
avfilter: add find_rect filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 21:15:48 +02:00
Martin Storsjö
16302246b1
avconv: Add an option for automatically rotating video according to display matrix
...
The option is enabled by default, but can be disabled.
If this is enabled, such side data isn't copied into the output stream
(except when doing stream copy).
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-02 22:09:06 +03:00
Martin Storsjö
e2d50fc2f5
avplay: Add support for rotated video
...
This is enabled by default, but can be disbled via the -noautorotate
option.
Based on a patch by Clément Bœsch.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-02 22:06:29 +03:00
James Zern
acb07f33c4
git-howto.texi: fix a typo
...
replace 'Refer to and to sync...' with a reference to the section that
discusses updated the source tree.
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Zern <jzern@google.com>
2015-04-23 23:56:21 -07:00
wm4
748d4816d9
avformat: add AVFMT_FLAG_FASTSEEK, use it for mp3
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-22 22:27:05 +02:00
Mate Sebok
4d98015dcf
dshow: add capture device save and load
...
Signed-off-by: Mate Sebok <smfinc.org@gmail.com>
Reviewed-by: Roger Pack <rogerdpack2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-22 20:12:36 +02:00
Vignesh Venkatasubramanian
f82ce6aa88
webmdashenc: parameter'ize minimumUpdatePeriod
...
Some players do not support setting minimumUpdatePeriod to zero.
This patch adds a new parameter that will let the users set any
value to this field. Also updates the test and the documentation.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-22 11:41:03 +02:00
Michael Niedermayer
122150168f
Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'
...
* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
drawtext: Add an alpha option
Conflicts:
doc/filters.texi
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-21 20:20:58 +02:00
Luca Barbato
9b2c57bef5
drawtext: Add an alpha option
...
And document both `draw` and `alpha`.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-21 11:13:30 +02:00
wm4
bac7084fbd
ffmpeg: add option not to offset seek position by start time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 19:50:58 +02:00
Michael Niedermayer
5a284d076f
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
...
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 05:28:13 +02:00
Michael Niedermayer
8e8219e0f0
Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'
...
* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e':
log: Introduce a more verbose debug level
Conflicts:
doc/APIchanges
doc/fftools-common-opts.texi
libavutil/log.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 02:48:19 +02:00
Vittorio Giovara
22526c1f55
Canopus HQ/HQA decoder
...
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19 22:37:23 +01:00
Vittorio Giovara
c253340ae6
log: Introduce a more verbose debug level
...
And deprecate av_dlog macro.
2015-04-19 12:41:59 +01:00
Stephen Hutchinson
7a5f444766
avisynth: Bump minimum required version to interface version 6
...
The AVSC_API changes in the new headers mean that the 2.6 alphas
are just as incompatible as 2.5 is.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-04-14 13:53:04 +02:00
Paul B Mahol
d2fc702ace
avfilter: add chorus filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-04-11 20:39:43 +00:00
Stephan Holljes
b51027fd18
libavformat/http.c: Make http-listen work as an input stream.
...
With this patch http can be used to listen for POST data to be used as an input stream.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 23:10:44 +02:00
James Almer
9fc45681e0
doc: add aarch64 cpuflags to fftools documentation
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-10 20:57:19 -03:00
James Almer
666ec9bd09
doc: add missing arm cpuflags to fftools documentation
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-10 20:57:15 -03:00
James Almer
410c93cfd5
doc: add missing x86 cpuflags to fftools documentation
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-10 20:57:11 -03:00
Timothy Gu
3d6069d01c
Use @verbatim instead of @example for ASCII arts
...
Partially fixes #3869 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 01:14:51 +02:00
Timothy Gu
5faca08caf
texi2pod: Handle @verbatim
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 01:00:07 +02:00
Vignesh Venkatasubramanian
6fd300ac6c
lavf: Add support for WebM Live Muxing
...
This patch adds support for WebM Live Muxing by adding a new WebM
Chunk muxer. It writes out live WebM Chunks which can be used for
playback using Live DASH Clients.
Please see muxers.texi for sample usage.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-07 15:08:59 +02:00
Luca Barbato
27f2746282
parseutils: Make av_small_strptime public
...
And use it in libavformat.
Based on a similar patch by Stefano Sabatini <stefasab@gmail.com>.
2015-04-07 12:36:11 +02:00
Lukasz Marek
f79cd98caf
examples/avio_list_dir: init/deinit network
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-04-06 15:50:26 +02:00
Stephan Holljes
4a58d757de
lavf/http: add proof-of-concept http server.
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-By: Nicolas George <george@nsup.org>
2015-04-05 10:17:47 +02:00
Andreas Cadhalpun
0224b35c89
avcodec: add unpack packed B-frames bitstream filter
...
Fixes Ticket #2913
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05 02:24:56 +02:00
Vignesh Venkatasubramanian
26f2e2f3f7
webmdashenc: Support for live stream manifests
...
This patch adds support for creating DASH manifests for WebM Live
Streams. It also updates the documentation and adds a fate test to
verify the behavior of the new muxer flag.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05 02:08:55 +02:00
Mariusz Szczepańczyk
f10aa0e125
doc/examples: Handle new types in avio_list_dir
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03 04:09:40 +02:00
Mariusz Szczepańczyk
26e0e393d0
lavf/avio: Add new types to AVIODirEntryType, bump minor version
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03 04:09:34 +02:00
Stephen Hutchinson
b2c05867f5
doc: Slightly revise AviSynth version info
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03 00:17:51 +02:00
Donny Yang
80be7daaa8
apng: Add a basic APNG muxer
...
Additionally, update some documentation with support for APNG
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-02 04:52:59 +02:00
Lukasz Marek
31886968d3
lavu/avstring: add av_append_path_component() funcion
...
Convinient function to build paths.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 23:50:46 +02:00
Marton Balint
c84b75c89c
vf_drawtext: add support for setting box border width
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 13:41:25 +02:00
Mariusz Szczepańczyk
f613f238f9
lavf: Bump minor version and document directory listing API in doc/APIchanges.
2015-03-30 23:02:53 +02:00
Michael Niedermayer
81487781e7
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavc/h264_refs: Fix compilation with -DTRACE.
Fix make checkheaders if libmfx is not available.
lavf/gif: Add an option max_gif_delay to limit the frame duration.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29 13:19:50 +02:00
Carl Eugen Hoyos
7de0fefeb5
lavf/gif: Add an option max_gif_delay to limit the frame duration.
...
Allows playback for the sample from ticket #4369 in less than 18 hours.
2015-03-29 12:31:00 +02:00
Michael Niedermayer
97a407f696
Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'
...
* commit '6fe2641d6e410b7bc203138fa97e1118b411f16d':
lavc: add profile define for DTS Express
Conflicts:
doc/APIchanges
libavcodec/version.h
See: 11fe56c8bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29 12:24:33 +02:00
Michael Niedermayer
268ff17cb7
Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
...
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
lavc: add MMAL hardware decoder wrapper
Conflicts:
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29 11:32:24 +02:00
Hendrik Leppkes
6fe2641d6e
lavc: add profile define for DTS Express
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-03-29 10:00:38 +02:00
wm4
c48456166e
lavc: add MMAL hardware decoder wrapper
...
Based on a patch by Rodger Combs.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-03-29 09:55:20 +02:00
Lukasz Marek
56b7aa2138
doc/examples: add directory listing example
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28 03:13:44 +01:00
Himangi Saraogi
fff7871772
lavfi: add inverse telecine filter
...
Approved-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-27 21:34:03 +01:00
Stephen Hutchinson
9f91c5198f
doc: remove the reference to supporting AviSynth 2.5
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-25 20:38:32 +01:00
Giorgio Vazzana
62e2fae8e4
ffmpeg: fix option name in documentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-24 23:41:01 +01:00
Stephen Hutchinson
1188119624
avisynth: update documentation about the avisynth_c.h header
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-24 10:31:04 +01:00
Carl Eugen Hoyos
c5d0148c7e
doc: Remove non-existing decklink options.
...
Reported-by: Bostjan Hamler
2015-03-24 09:54:04 +01:00
Timothy Gu
c3d0edd406
doc: Use @lisp where appropriate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-23 17:21:38 +01:00
Timothy Gu
ecba41bfd3
doc: More semantic markup using @samp and @var where appropriate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-23 17:08:08 +01:00
Timothy Gu
641ef7d4f7
doc/fate: better formatting
...
The initial spaces get ignored anyway so let's be consistent with other docs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-23 13:16:42 +01:00
Michael Niedermayer
50255b7a86
Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'
...
* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
cmdutils: Add a stream specifier to map usable streams
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-20 20:15:40 +01:00
Luca Barbato
342fc46c69
cmdutils: Add a stream specifier to map usable streams
...
It drops everything that cannot be used for re-encoding and/or
streamcopy.
2015-03-20 16:10:20 +01:00
arwa arif
9015ca359f
lavfi/eq: rework expression evaluation
...
In particular, add support for t, pos, n, r parameters, and add an eval
mode option.
Also, partially reword option documentation.
With several major edit by Stefano Sabatini.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-03-20 09:41:32 +01:00
Clément Bœsch
304fdfe9f3
lavfi: add showwavespic filter
...
This is a variant of showwaves. It is implemented as a different filter
so that the user is not allowed to use meaningless options which belong
to showwaves (such as rate).
Major edits done by Stefano Sabatini, from a patch by ubitux.
See thread:
From: Clément Bœsch <u@pkh.me>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 24 Dec 2014 15:03:26 +0100
Subject: [FFmpeg-devel] [PATCH] avfilter/showwaves: add single_pic option
2015-03-18 12:19:08 +01:00
Tobias Rapp
5be04f9789
doc/protocols: Fixed missing example section marker
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 15:04:22 +01:00
Janne Grunau
a9d60c390f
doc: fate: remove outdated SSH key fingerprint
2015-03-16 11:55:47 +01:00
Michael Niedermayer
209001073a
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
...
* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
dca: Support for XLL (lossless extension)
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15 22:18:41 +01:00
Niels Möller
217e4ff4d1
dca: Support for XLL (lossless extension)
...
Cleanup and integration by Diego Biurrun.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-03-15 14:51:36 +01:00
Michael Niedermayer
e1f37c48e5
Merge commit '247e370e2a913db52ca079b347a174c8d393b171'
...
* commit '247e370e2a913db52ca079b347a174c8d393b171':
TDSC decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-13 23:23:01 +01:00
Vittorio Giovara
247e370e2a
TDSC decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-03-13 19:48:14 +00:00
Carl Eugen Hoyos
a47c2a1d5f
doc: Fix alphabetic ordering for decklink input device.
2015-03-13 01:57:42 +01:00
Carl Eugen Hoyos
6453fddb58
doc: Clarify documentation for fade duration.
2015-03-09 10:57:58 +01:00
Carl Eugen Hoyos
4a94f7b22f
doc: Improve video creation examples (from image2).
...
The examples used to drop frames in most cases which
was probably not what users expected.
2015-03-09 10:49:59 +01:00
Michael Niedermayer
fa14685a57
Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'
...
* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
avprobe: Export coded_{width,height} in -show_streams
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08 23:58:18 +01:00
Andreas Cadhalpun
10fd7ff814
doc: avoid the incorrect phrase 'allow to'
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08 21:59:28 +01:00
Michael Niedermayer
8fabbd0dcf
doc/filters: Add some random examples for fftfilt
...
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08 15:02:49 +01:00
Arwa Arif
48b5be65ae
avfilter: Add FFT domain filter.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-07 13:07:10 +01:00
Michael Niedermayer
665d47f435
Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'
...
* commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8':
doc: Add -list_formats all example for video4linux2
Conflicts:
doc/indevs.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-07 01:16:17 +01:00
Jonas Lindgren
cecf45b2bf
doc: Add -list_formats all example for video4linux2
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-06 23:06:20 +01:00
Andreas Cadhalpun
482c86f231
fix spelling errors
...
opttimizations -> optimizations
grabing -> grabbing
many resource -> many resources
isnt -> isn't
silcense -> silence
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06 21:35:00 +01:00
Michael Niedermayer
0b48ddc5f2
doc/APIchanges: Fill in the xx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06 16:39:50 +01:00
Michael Niedermayer
34300866a8
doc/APIchanges: Add 2.6 cut marker
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06 16:20:52 +01:00
Stefano Sabatini
6db20926c3
doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds
...
s->listen_timeout is passed to ff_listen_bind(), which accepts a timeout
value expressed in milliseconds.
The unit was incorrectly set in 1b4da43ce0
.
2015-03-05 12:13:25 +01:00
wm4
cca44764b9
avformat: add avformat_flush()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-05 00:09:26 +01:00
Mark Reid
81a91269a2
libavformat/avio: added avio_put_str16be
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-03 17:49:15 +01:00
Michael Niedermayer
e73b3dba3e
Merge commit '990e4a6639d0714198583c2812b1074b5751898f'
...
* commit '990e4a6639d0714198583c2812b1074b5751898f':
Add a QSV decoding example.
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-01 00:30:20 +01:00
Anton Khirnov
990e4a6639
Add a QSV decoding example.
2015-02-28 21:51:24 +01:00
Nicolas George
508d6a23b4
ffmpeg: allow to set the thread message queue size.
2015-02-26 19:19:56 +01:00
Clément Bœsch
ab093bdeef
avfilter/palettegen: export color quantization ratio
2015-02-26 14:20:02 +01:00
Michael Niedermayer
2fbdf30efe
Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'
...
* commit 'b31328d008985f87f0a7c83c700847cef1a4f08c':
xcbgrab: Provide better names for the y and x option
Conflicts:
doc/indevs.texi
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25 01:12:50 +01:00
Luca Barbato
b31328d008
xcbgrab: Provide better names for the y and x option
...
Incidentally `-y` also collides with avconv global options.
Update x11grab to match and document the option.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-24 22:31:20 +01:00
Tobias Rapp
f34aca8a16
doc/filters.texi: add reference link to video size syntax description
...
Update the filter option documentation text to link to ffmpeg-utils
documentation for video size syntax description.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-02-24 18:24:42 +01:00
Michael Niedermayer
2cf521718d
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
...
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
Canopus HQX decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-23 12:19:26 +01:00
Clément Bœsch
92b7f56193
avfilter/paletteuse: add diff_mode
2015-02-23 09:56:22 +01:00
Vittorio Giovara
35c6ce76b1
Canopus HQX decoder
...
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
2015-02-22 22:42:27 +00:00
Michael Niedermayer
9b41bf5c3d
Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'
...
* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
tests: drop bc dependency
Conflicts:
tests/fate-run.sh
See: d47eeff274
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 12:08:31 +01:00
Clément Bœsch
a982c5d74f
tests: drop bc dependency
...
We already have a dependency on awk and bc is sometimes not found in the
base system.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:17:45 +02:00
Arwa Arif
627d2a7628
avfilter/vf_eq: Add process_command to eq.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 00:06:37 +01:00