generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
73,816 Commits 24 Branches 241 Tags 173 MiB
bf1fd59c6a
Commit Graph

5459 Commits

Author SHA1 Message Date
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
Michael Niedermayer
e821910a21 Merge commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499' 
* commit '062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
  lavf: Add DSS demuxer

Conflicts:
	libavformat/Makefile
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:44:58 +01:00
Michael Niedermayer
dfe5a9f022 Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b' 
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
  lavc: Add DSS SP decoder

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 21:31:26 +01:00
Michael Niedermayer
560eb7179a Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49' 
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
  h264_parser: export video format and dimensions

Conflicts:
	libavcodec/h264_parser.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 20:39:04 +01:00
Michael Niedermayer
e3755119fa Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a' 
* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
  pixfmt: add a pixel format for QSV hwaccel

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-19 20:23:48 +01:00
Oleksij Rempel
062cd5a975 lavf: Add DSS demuxer 
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-19 12:05:19 -05:00
Oleksij Rempel
c56b9b1eb2 lavc: Add DSS SP decoder 
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-19 12:05:19 -05:00
Anton Khirnov
31d2039cb4 h264_parser: export video format and dimensions 2015-02-19 15:07:52 +01:00
Anton Khirnov
5b1d9ceec7 pixfmt: add a pixel format for QSV hwaccel 2015-02-19 15:07:21 +01:00
Nicolas George
c49c42a4a3 doc/faq: explain DAR/SAR preserving. 2015-02-19 11:30:30 +01:00
Nicolas George
b491751409 doc: set documentencoding on toplevel texi files. 
Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.
 2015-02-19 11:30:30 +01:00
Christophe Gisquet
bc8e044d8c x86/doc/Makefile: DBG=1 to preprocess external asm 
The macro hell sometimes make it difficult to trace the source of
an error, so it is easier to analyze the preprocessed output.

This patch makes this automatical by specifying DBG=1 on the
command line: a file ffmpeg/dir/file.asm gets preprocessed to
builddir/dir/file.dbg.asm, which is then compiled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 13:08:04 +01:00
Clément Bœsch
bab4fcebb1 avfilter: add paletteuse filter 2015-02-14 20:48:50 +01:00
Clément Bœsch
9b964690e3 avfilter: add palettegen filter 2015-02-14 20:48:50 +01:00
Paul B Mahol
ba22295e76 lavc: deprecate VIMA decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-14 12:48:41 +00:00
Michael Niedermayer
c74b3983f9 Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e' 
* commit 'faa8ffda2c513573733624784f0a7d0a4959d33e':
  doc/APIchanges: fill in missing dates and hashes

Conflicts:
	doc/APIchanges

See: c651a1aaec
See: 8c8ee17e8d and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-13 11:54:38 +01:00
Anton Khirnov
faa8ffda2c doc/APIchanges: fill in missing dates and hashes 
Also, move a misplaced block to the right position.
 2015-02-13 08:35:15 +01:00
Paul B Mahol
edf217ebb7 avfilter: add dcshift filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-02-11 14:58:35 +00:00
Michael Niedermayer
26db9d3b77 doc/ffmpeg: Document frame_drop_threshold 2015-02-10 15:10:56 -09:00
Paul B Mahol
8b77c4dd42 avfilter: Add repeatfields filter (Port of mp=softpulldown) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-10 19:07:20 +01:00
Andreas Cadhalpun
078be09dd7 examples/demuxing_decoding: abort decoding when width, height or pix_fmt change 
This is necessary, because avcodec_decode_video2 can change
width, height and/or pixel format of the AVCodecContext. Since
video_dst_data and video_dst_linesize are not updated by calling
av_image_alloc again, av_image_copy[_plane] asserts, because the
destination buffer is too small.

In this case, creating a useable rawvideo is not possible anyway, since
it has fixed width/height/pix_fmt.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-10 02:43:47 +01:00
Georg Lippitsch
c0367f78d5 doc/indevs: Docs for Blackmagic high bit depth video/audio 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 01:18:58 +01:00
Anshul Maheshwari
1df841f154 doc/APIchanges: updated Data stream changes in APIChange 
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-08 18:39:22 +01:00
Eejya Singh
40b198e987 lavfi/subtitles: add force_style option 
Signed-off-by: Eejya Singh <singh.eejya@gmail.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
 2015-02-08 11:36:49 +01:00
Liviu Oniciuc
d2330e5844 doc/muxers/image2: remove the non-negative number requirement for start_number 
Update after b37858eae1.
 2015-02-04 13:17:30 +01:00
dhead666
48e36f8a12 libavformat/mpegtsenc: allow to set service_type in sdt 
This adds an option to set the service type in mpegts as defined in ETSI 300 468.

I added what I believe are the most useful service types as pre defined values,
the others can be sent by using their hexdecimal form directly (e.g. -mpegts_service_type digital_radio, -mpegts_service_type 0x07).

I've been using this patch in order to pipe internet radio stream (originally as HLS/m3u8) from ffmpeg to tvheadend,
when the service type set right tvheadend recognize the mpegts stream as a radio channel.

The patch in its original form was written by linuxstb from freenode's hts channel which allowed me pushing it upstream.

This close issue 4118.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-02 22:02:26 +01:00
Stefano Sabatini
7b35a01ff0 doc/ffprobe.xsd: drop build_date and build_time from programVersionType 
Update schema after commit:
103e4c5863
 2015-02-02 10:08:22 +01:00
Andreas Cadhalpun
aa2c75e9ad doc/doxy-wrapper.sh: autodetect version 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-02 05:04:14 +01:00
Andreas Cadhalpun
103e4c5863 stop embedding the build date 
Theis makes the build binary reproducible.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-02 05:04:14 +01:00
Michael Niedermayer
9bacb576bc Merge commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16' 
* commit 'f726fc21ef76a8ba3445448066f7b2a687fbca16':
  ogg: Provide an option to offset the serial number

Conflicts:
	libavformat/oggenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-01 13:22:21 +01:00
Luca Barbato
f726fc21ef ogg: Provide an option to offset the serial number 
The ogg serial number doubles as codec id and sequence
value for concatenated samples.
 2015-02-01 02:28:40 +01:00
Andreas Cadhalpun
2a3b7a55b5 examples/demuxing_decoding: set stream_idx in open_codec_context only if no error occured 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-31 21:54:36 +01:00
Paul B Mahol
e7e0005cc6 remove libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-31 12:01:54 +00:00
Stefano Sabatini
f422f474df doc/indevs/libcdio: apply minor spell fixes, extend documentation 2015-01-31 11:32:05 +01:00
Paul B Mahol
9fd925dee5 lavfi: remove mp=softpulldown 
It is supposed to work correctly with MEncoder only.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-30 16:10:11 +00:00
Stefano Sabatini
40b026b1d0 doc/muxers/segment: document strftime option 
It was added in commit 202947a066.
 2015-01-30 11:52:37 +01:00
Lou Logan
961f2e3aac doc/indevs: add some XCB info to x11grab 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2015-01-29 13:12:13 -09:00
Stefano Sabatini
d43c1ec684 examples/filtering: extend comments about setting the filter graph endpoints 
That part is a constant source of confusions for readers, this should
help clarify the apparently inverted logic.
 2015-01-29 11:12:39 +01:00
Stefano Sabatini
af7b89e08b lavfi: document assumptions about the input and output labels of a filter graph description 2015-01-29 10:12:34 +01:00
Stefano Sabatini
d11fcf735f doc/filters: apply some updates to the Filtergraph syntax section 2015-01-29 10:12:34 +01:00
Maneesh Gupta
1600f85cbc doc/fftools-common-opts: update/extend documentation for -opencl_bench option 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2015-01-28 10:00:30 +01:00
Michael Niedermayer
62a82c66cd Merge commit '728685f37ab333ca35980bd01766c78d197f784a' 
* commit '728685f37ab333ca35980bd01766c78d197f784a':
  Add a side data type for audio service type.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/frame.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 18:03:43 +01:00
Michael Niedermayer
e5c28d4f9a Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee' 
* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:35:31 +01:00
Michael Niedermayer
d078d57fb7 Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e' 
* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
  examples/transcode_aac: fix a typo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:29:46 +01:00
Michael Niedermayer
010311d673 Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761' 
* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
  examples/transcode_aac: properly select the output sample format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:21:02 +01:00
Anton Khirnov
728685f37a Add a side data type for audio service type. 
Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.
 2015-01-27 09:17:48 +01:00
Andreas Unterweger
3a70c0c95f examples/transcode_aac: generate proper PTS and set the muxer timebase 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:03:08 +01:00
Andreas Unterweger
c9b19ac892 examples/transcode_aac: fix a typo 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:00:23 +01:00
Andreas Unterweger
749a89d1b8 examples/transcode_aac: properly select the output sample format 
Makes the example work with all the supported AAC encoders.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 08:58:47 +01:00
Michael Niedermayer
fcb18ab8d0 Merge remote-tracking branch 'rdp/dshow_tv_tuner' 
* rdp/dshow_tv_tuner:
  dshow: tweak logging
  dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
  dshow: alert as to ramifications of switching crossbar routing
  dshow: add properties dialog for tv tuners

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-26 14:39:25 +01:00
Stefano Sabatini
0ca5c4dade lavfi/mp: drop mp=eq and mp=eq2 
mp=eq2 was ported to a native libavfilter filter in commit
4c38e960d0.
 2015-01-26 11:09:02 +01:00
rogerdpack
7c2e262701 dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 01:29:58 -07:00
rogerdpack
ce1bbb08f1 dshow: alert as to ramifications of switching crossbar routing 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 01:08:09 -07:00
rogerdpack
c55fa2f09b dshow: add properties dialog for tv tuners 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-26 00:28:26 -07:00
Arwa Arif
4c38e960d0 avfilter: Port mp=eq/eq2 to lavfi 
Code adapted from James Darnley's port
Some fixes from Paul B Mahol <onemda@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-26 00:14:04 +01:00
Michael Niedermayer
c50ddc10b2 doc/APIchanges: fill in the remaining missing dates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-25 14:16:31 +01:00
Michael Niedermayer
c651a1aaec doc/APIchanges: Fill in remaining missing hashes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-24 13:18:15 +01:00
Michael Niedermayer
76241c9115 Merge remote-tracking branch 'rdp/dshow_crossbar' 
* rdp/dshow_crossbar:
  dshow: fix docu escapes
  dshow: some devices only list themselves under "Video sources" but actually have both video and audio output pins, so make the audio pins accessible by video source name.
  dshow: add options for allowing filter popup configuration dialogs to be presented to the user
  dshow: introduce support for crossbar [multiple input selectable] devices
  dshow: drop initial audio packets with weird timestamps
  dshow: use non deprecated api
  dshow: miscellaneous tweaks
  dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 23:52:37 +01:00
rogerdpack
b587ec00f7 dshow: fix docu escapes 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-01-23 08:32:27 -07:00