virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
57,806 Commits 37 Branches 400 Tags 465 MiB
1a6948fa70
Commit Graph

4220 Commits

Author SHA1 Message Date
Timothy Gu
1fdae1017c doc/codecs: Add ignorecrop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:59:49 +02:00
Timothy Gu
db4a677433 doc/codecs: Remove no longer existing options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:59:07 +02:00
Timothy Gu
a55e813e53 doc/codecs: Cosmetics in the flags2 description 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 19:57:47 +02:00
Michael Niedermayer
dfb89fee2d doc/codecs: document skip_alpha 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 16:59:32 +02:00
Stefano Sabatini
f02bab6d09 doc/filters/scale: do not explicitly state the default swscale flags value 
This is done is order to avoid the need of synching scale with libswscale
docs in case the libswscale default changes.
 2013-10-11 16:40:20 +02:00
Michael Niedermayer
cdc9657a0c doc/codecs: Document field_order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 16:03:37 +02:00
Timothy Gu
7ab8bceabc doc/encoder/aac: Remove -cutoff trick 
Fix Ticket #2686 comment 155.

Trick obsoleted since 72dabdfc58.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 13:43:56 +02:00
Clément Bœsch
56db86a0b2 doc/filters: remove extra spacing in vid.stab section. 2013-10-09 13:22:04 +02:00
Timothy Gu
df08fd5e1e doc/default.css + doc/t2h.init: New styles 
The main motive of this commit is to make the offline copy of the HTML doc as
pretty as the online (ffmpeg.org) one. This also introduced new styles for
<h2> to <h4>.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 04:01:46 +02:00
Lukasz Marek
361b56c379 lavd: pulse audio encoder 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 14:31:50 +02:00
Lukasz Marek
c21be5845f doc/indevs: make pulse dev formatting consistent with other devices 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-07 12:01:51 +02:00
Niv Sardi
49ba6e56bd lavu/parseutils: add more resolutions 
See http://en.wikipedia.org/wiki/Graphics_display_resolution

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-07 11:45:03 +02:00
Michael Niedermayer
931a4b433d avfilter/vf_scale: change the default scaler to bicubic 
See: [FFmpeg-devel] [PATCH] swscale/options: switch default to bicubic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-06 11:00:48 +02:00
Michael Niedermayer
ccf96f8c64 swscale/options: switch default to bicubic 
Suggested-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-06 10:47:09 +02:00
Michael Niedermayer
e57dba0d52 avcodec: add av_codec_get_max_lowres() 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-03 16:33:09 +02:00
Marton Balint
0362cf1a19 avfilter/vf_histogram: add mirrored waveform mode 
Added parameter to mirror the waveform (high values are shown on top in column mode)

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-02 21:02:59 +00:00
Michael Niedermayer
4c292d5c34 Merge remote-tracking branch 'rbultje/master' 
* rbultje/master:
  Full-pixel MC functions.
  VP9 MC (ssse3) optimizations.
  Native VP9 decoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-03 13:56:52 +02:00
Stefano Sabatini
f5b27b6d5f ffprobe: print stream channel_layout when available 
Fix trac ticket #3006.
 2013-10-03 09:19:38 +02:00
Ronald S. Bultje
848826f527 Native VP9 decoder. 
Authors: Ronald S. Bultje <rsbultje gmail com>,
         Clement Boesch <u pkh me>
 2013-10-02 21:03:11 -04:00
Michael Niedermayer
5082fcc0e2 avformat: add support to force specific AVCodecs 
previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-02 22:56:03 +02:00
Paul B Mahol
edadda968c avfilter/vf_histogram: change order of histograms for planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-01 21:22:22 +00:00
Stefano Sabatini
8fafaf1834 doc: move sws_dither option description to scaler.texi 
That's the more proper place where the scaler options should be
documented.
 2013-09-30 16:54:46 +02:00
Stefano Sabatini
d17aaad630 doc/filters/scale: mention and link scaler options 2013-09-30 16:50:44 +02:00
Stefano Sabatini
fd0a1647f2 doc/filters/scale: fix MAN rendering of @ref arguments 2013-09-30 16:43:33 +02:00
Michael Niedermayer
31b6300f4d doc: try to add a link from the vf_scale sws_flags to the scaler docs 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-30 16:09:58 +02:00
Timothy Gu
8fd8ead23c doc/t2h.init: remove resource-type and distribution meta elements 
The W3C validator complains about these.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-30 11:56:16 +02:00
Clément Bœsch
565fd3cc1a doc/faq: add @command{} in the tool debug entry. 2013-09-29 23:31:12 +02:00
Clément Bœsch
2e798c6ce0 doc/faq: remove indent in examples. 
CSS should take care of this.
 2013-09-29 23:31:12 +02:00
Clément Bœsch
eafb9c52e8 doc/faq: remove Delphi/Pascal entry. 
Link is dead.
 2013-09-29 23:31:12 +02:00
Clément Bœsch
e6273592e4 doc/faq: rework r_frame_rate entry. 2013-09-29 23:31:12 +02:00
Paul B Mahol
5a47f12390 doc/demuxers: fix image2 examples 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-29 16:36:25 +00:00
Michael Niedermayer
7381d31f22 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: allow user-provided execute() callbacks

Conflicts:
	libavfilter/avfilter.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-28 11:02:01 +02:00
Anton Khirnov
0767bfd199 lavfi: allow user-provided execute() callbacks 2013-09-28 08:06:19 +02:00
Georg Martius
e064d0aaf6 avfilter/vidstabtransform: update optzoom range values for recent vid.stab update. 
Signed-off-by: Georg Martius <martius@mis.mpg.de>
 2013-09-27 16:48:31 +00:00
Paul B Mahol
110a2f446d avfilter/af_ladspa: allow changing controls dynamically 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-27 12:49:55 +00:00
Michael Niedermayer
f31c36e552 Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93' 
* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
  tls: Add support for listen mode

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: 4f4eb380f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-27 11:33:19 +02:00
Michael Niedermayer
e6e71fd7b5 Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c' 
* commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c':
  tls: Add options for verifying the peer certificate

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: b2460858f6
See: 973a758f52
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-27 09:33:28 +02:00
Paul B Mahol
7e52080cb1 pcm: support 24-bit/32-bit little-endian planar 
Used by LXF.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-09-27 01:33:45 +02:00
Martin Storsjö
705b748e8d tls: Add support for listen mode 
Also add options for specifying a certificate and key, which can
be used both when operating as client and as server.

Partially based on a patch by Peter Ross.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-26 23:13:35 +03:00
Martin Storsjö
8b09d917e7 tls: Add options for verifying the peer certificate 
A file containing the trusted CA certificates needs to be
supplied via the ca_file AVOption, unless the TLS library
has got a system default file/database set up.

This doesn't check the hostname of the peer certificate with
openssl, which requires a non-trivial piece of code for
manually matching the desired hostname to the string provided
by the certificate, not provided as a library function.

That is, with openssl, this only validates that the received
certificate is signed with the right CA, but not that it is
the actual server we think we're talking to.

Verification is still disabled by default since we can't count
on a proper CA database existing at all times.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-26 23:13:06 +03:00
Anton Khirnov
2725f2d403 doc/filters: fix an option name in the unsharp docs 2013-09-24 17:22:11 +02:00
Lukasz Marek
23ad4d6f58 doc/outdevs: add sdl window_fullscreen option 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-23 23:37:14 +02:00
Timothy Gu
ca10d66719 doc/filters: add [] labels for the graph of the opening paragraph example 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-23 00:11:56 +02:00
Stefano Sabatini
21f6ff3801 doc/filters: use between() function in select examples 
Simplify.
 2013-09-22 23:54:39 +02:00
Stefano Sabatini
57618d80af doc/fftools: rework some paragraph in the AVOptions chapter 
Fix typos, and clarify note about codec AVOptions.
 2013-09-22 23:54:39 +02:00
Paul B Mahol
0de4efb8d7 doc/filters: put ladspa configure option into @code{} 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-22 20:41:01 +00:00
Paul B Mahol
f8e8932e92 doc/filters: mention configure option for ladspa 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-22 18:45:50 +00:00
Paul B Mahol
601eab2bbf avfilter: add ladspa wrapper filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-22 16:36:10 +00:00
Michael Niedermayer
85f8a3cb50 Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c' 
* commit 'e208e6d209728d332343aa5390ae377ac0a6305c':
  lavu: Add interleaved 4:2:2 8/10-bit formats

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

See: 90ca5a9b5f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-22 11:42:03 +02:00
Kieran Kunhya
e208e6d209 lavu: Add interleaved 4:2:2 8/10-bit formats 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-09-21 17:36:15 +02:00
Carl Eugen Hoyos
ac82155204 Remove '-vf' from pullup documentation example. 2013-09-21 12:17:20 +02:00
Lukasz Marek
5b153f8164 lavf: add SFTP protocol via libssh 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-21 03:26:54 +02:00
Carl Eugen Hoyos
705b30e24f Improve pullup documentation. 
Mention that the fps filter should be used after pullup.
 2013-09-21 03:24:24 +02:00
Paul B Mahol
1f5d1342ea doc: Add missing hashes and dates to APIChanges 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 16:57:48 +00:00
Paul B Mahol
390c35a13b lavfi/mp: remove mp=qp 
The filter does nothing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-19 15:53:45 +00:00
Michael Niedermayer
b26ccf218d Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff' 
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
  Add a WebP decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/img2.c

The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-19 12:36:11 +02:00
Stefano Sabatini
f0606a28de ffprobe: add -read_intervals option 
This is also useful to test seeking on an input file.

This also addresses trac ticket #1437.
 2013-09-19 10:10:30 +02:00
Stefano Sabatini
6230a95659 doc/muxers: itemize tee examples 
Improve rendering.
 2013-09-19 10:07:53 +02:00
James Almer
164e0e544f doc/APIchanges: Fix two hashes 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 22:50:52 +02:00
Justin Ruggles
c4bfa09807 Add a WebP decoder 
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org>
Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
 2013-09-18 14:10:05 -04:00
Paul B Mahol
8302abf844 lavfi/mp: remove mp=pullup 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-18 11:05:27 +00:00
Michael Niedermayer
4d09d2ef9f doc/APIchanges: List merge commit hashes and version numbers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-18 01:44:29 +02:00
Michael Niedermayer
7703d19c40 lavf/options_table: improve option help text 
Contains text suggested by carl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-17 19:47:58 +02:00
Paul B Mahol
9c774459a9 avfilter: port pullup filter from libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-17 17:03:36 +00:00
Michael Niedermayer
0988709673 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Add missing hashes and dates to APIChanges

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-17 17:09:58 +02:00
Luca Barbato
c38854c399 doc: Add missing hashes and dates to APIChanges 
Also fix the typo in the last entry version.
 2013-09-17 13:31:54 +02:00
Stefano Sabatini
4149981b37 doc/fftools-common-opts: document -help long and full output 2013-09-17 12:30:40 +02:00
Michael Niedermayer
c74c3fb142 Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7' 
* commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7':
  mem: Introduce av_reallocp

Conflicts:
	doc/APIchanges
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-17 11:06:26 +02:00
Luca Barbato
3feb3d6ce4 mem: Introduce av_reallocp 2013-09-16 19:36:37 +02:00
Timothy Gu
b7dd459863 doc/formats: Add documentation for 3 parameters that have been missing 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-16 17:49:10 +02:00
Paul B Mahol
9d05de2258 avfilter: add adelay filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-16 14:33:07 +00:00
Timothy Gu
81bbe49a0e doc/encoders: improve libvo-aacenc doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-15 11:35:32 +02:00
Timothy Gu
0e11790cf7 doc/encoders: add doc for AAC encoder 
Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-15 11:35:17 +02:00
Michael Niedermayer
c45e9097d8 Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c' 
* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c':
  doc: Drop VDPAU from list of supported codecs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 12:42:11 +02:00
Timothy Gu
83165e39fe doc: Rename avtools-common-opts to fftools-common opts 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 18:04:03 +02:00
Diego Biurrun
ec17d1aa8b doc: Drop VDPAU from list of supported codecs 2013-09-10 12:38:41 +02:00
James Almer
e3d34100e7 doc: add *install-doc that covers all documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 05:25:17 +02:00
James Almer
1e97ae4ba3 doc: rename *install-doc to *install-html 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-07 21:41:43 +02:00
James Almer
2df184f3d5 doc: fix install-doc dependencies 
Put it inside its own ifdef conditional.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-07 21:41:43 +02:00
Paul B Mahol
898c6191ff lavfi: Weston 3 Field Deinterlacing Filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 12:46:56 +00:00
Paul B Mahol
d2e237338d lavfi/mp: remove mp=fil 
The filter does not work correctly most of time.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-05 20:22:47 +00:00
Paul B Mahol
0a8bb91505 lavfi/mp: remove mp=dint 
There are better and actually maintained filters that have similar
functionality.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-05 20:03:36 +00:00
Clément Bœsch
f974289671 doc/APIchanges: update hashes and dates after last two commits. 
Sorry, I'm too lazy to fix the rest.
 2013-09-04 22:18:59 +02:00
Clément Bœsch
3e1f507f3e avcodec: make avcodec_close() more tolerant. 
See previous commit.
 2013-09-04 22:06:38 +02:00
Clément Bœsch
36cd017acd avformat: make avformat_close_input() more tolerant. 
The purpose of this commit is to make error management simpler and less
error prone, just like av_free() which is safe with NULL.
 2013-09-04 22:06:38 +02:00
Clément Bœsch
dc8f732292 doc/examples: fix lib math dep for resampling_audio. 
It uses at least sin()
 2013-09-04 15:49:18 +02:00
Clément Bœsch
98b9bbb787 doc/examples: remove extra "the". 
"into the doc/examples directory" vs "into doc/examples".
 2013-09-04 15:46:31 +02:00
Michael Niedermayer
35307df53c Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748' 
* commit '0ebfdae099d2749240b6a565abcdf0bf62589748':
  doc: Describe TB option of setpts filter

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 14:06:46 +02:00
Clifford Wolf
0ebfdae099 doc: Describe TB option of setpts filter 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-09-04 12:28:28 +02:00
Clément Bœsch
30d40c9e86 lavfi/drawtext: add generic timeline interface and deprecate "draw". 2013-09-03 21:12:15 +02:00
Paul B Mahol
916549cb1e lavfi/mp: remove mp=phase 
The filter was ported to a native libavfilter filter.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-03 14:05:38 +00:00
Paul B Mahol
3dd4b6ea41 lavfi: port phase filter from libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-03 14:05:38 +00:00
Michael Niedermayer
4cfe3b7405 Merge commit '7df9e693a34c84c698da60426c78140c950f95ed' 
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
  cosmetics: Fix ATRAC codec name spelling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 15:05:18 +02:00
Diego Biurrun
7df9e693a3 cosmetics: Fix ATRAC codec name spelling 2013-09-02 21:38:57 +02:00
Marton Balint
b339dccbba lavc: add teletext decoder using libzvbi 
Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html

The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>.

Lots of additional features and fixes are made by me.

Fixes ticket #2086.

Changes since last version:
- change default page to all pages

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-02 01:19:52 +02:00
Michael Niedermayer
91acb23a28 doc: fix insane hard texi2html dependancy 
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 20:02:52 +02:00
Michael Niedermayer
d8809b357c Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c' 
* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
  configure: Add docdir configuration option

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 13:42:37 +02:00
Stefano Sabatini
291ad12ea2 ffprobe: show probe_score in the format section 
Should address trac ticket #2621.
 2013-09-01 11:34:18 +02:00
Stefano Sabatini
51b01573e5 ffprobe: fix format section XML validation 
It was broken since 2186a7e547.
 2013-09-01 11:34:12 +02:00
Vittorio Giovara
f4ca970dba configure: Add docdir configuration option 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-08-31 16:16:38 +02:00