RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
70,610 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

5294 Commits

Author SHA1 Message Date
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