generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
49,747 Commits 24 Branches 241 Tags
Commit Graph

3293 Commits

Author SHA1 Message Date
Michael Niedermayer
73bfb21672 Update for 1.1.16 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-13 18:09:08 +01:00
Michael Niedermayer
c5f52a9440 Update for 1.1.15 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-21 04:51:41 +01:00
Michael Niedermayer
2b8effcda3 Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1 
* commit '9920a8a83f578821e00212da6b79c8997a725fa8':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-21 04:04:48 +01:00
Diego Biurrun
9920a8a83f doc: Fix syntax and logical errors in avconv stream combination example 
Bug-Id: 661
CC: libav-stable@libav.org
(cherry picked from commit 775a0b04f0cf8102fe322b2ee03fe1a0633dea04)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-10 12:08:22 -07:00
Michael Niedermayer
195fcbff2b Update for 1.1.14 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 21:44:13 +02:00
Michael Niedermayer
41e8591515 update for 1.1.13 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 22:45:52 +02:00
Michael Niedermayer
4dfd4399ea Update for FFmpeg 1.1.12 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 00:13:49 +02:00
Michael Niedermayer
03bda44689 Update for 1.1.11 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-10 22:12:32 +02:00
Michael Niedermayer
5f390ee944 Update for FFmpeg 1.1.10 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-22 01:01:20 +02:00
Michael Niedermayer
ed9ab30f4c Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1 
* commit 'd791e8c990a752435d993df01516ebe469d94535':
  doc: Point to the correct, actually maintained gas-preprocessor repo

Conflicts:
	doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-21 14:20:35 +02:00
Martin Storsjö
d791e8c990 doc: Point to the correct, actually maintained gas-preprocessor repo 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d15c536123a44362ace6299c391a492c90b83fc7)
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-03-16 20:54:46 +02:00
Michael Niedermayer
26e1bccec6 update for 1.1.9 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 04:14:03 +01:00
Paul B Mahol
aeccfca268 avcodec/libopusenc: change default frame duration to 20 ms 
20 ms is used by libopus encoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 04:04:07 +01:00
Michael Niedermayer
1017b5914c update for 1.1.8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 15:20:18 +01:00
Michael Niedermayer
4bc7c1ba8e update for 1.1.7 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 15:39:23 +02:00
Timothy Gu
a4acb5b900 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>
(cherry picked from commit 0e11790cf7eef3b0f38a64486da1e3fb8c7f14b8)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-09-22 15:22:34 -07:00
Timothy Gu
c42fd4c6ee doc/ffmpeg-formats: Add documentation for 2 parameters that have been missing 
(partially cherry picked from commit b7dd4598630fb1f890ae060f21a9ec92a103f22d)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/formats.texi
 2013-09-22 15:11:00 -07:00
Timothy Gu
3eee21406a doc/encoders: improve libvo-aacenc doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 81bbe49a0e588aa899f37a567808ba8926d798d6)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-09-22 15:01:32 -07:00
Timothy Gu
852ee0e0ad doc/encoders: Remove options that were not there when branch was cut from master 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-09-22 14:59:41 -07:00
Timothy Gu
ed2c15eadc doc/encoders: reformat and add some clarification in libtwolame doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit e45e72f5f89ef5a5791562cfcb935028b46ecd0a)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-09-22 14:59:41 -07:00
Timothy Gu
4ad0330b3d doc/encoders: reformat libmp3lame doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 40b8350b57adaa9aaf6731bac5130d4fec1639c3)

Conflicts:
	doc/encoders.texi
 2013-09-22 14:59:41 -07:00
Michael Niedermayer
86bf0a8871 update for 1.1.6 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 04:55:35 +02:00
Stefano Sabatini
b7a4b4c145 doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields 
Fix potential spurious substitution.
(cherry picked from commit 9167db3829f360f241255d4240ba6b7135ab4111)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:20 -07:00
Stefano Sabatini
de1609bc2d doc/texi2pod: fix warnings introduced in e7e14bc69a606a6bec82efef729263cd38f122d4 
The variable "$section" was replaced by "$chapter".
(cherry picked from commit c0c06c1bba80c4bee162a3c40eec678ddc65571d)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:20 -07:00
Luca Barbato
bd055c1768 doc: support multitable in texi2pod 
(cherry picked from commit 5ea5ffc9cee1b91eed471fff2f51d771222cf8d2)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:20 -07:00
Stefano Sabatini
2892b01227 doc/texipod: add rule to correctly interpret @ref{ANCHOR,XREF,SECTION_NAME,...} 
This allows to name an internal reference in the POD/MAN output.
(cherry picked from commit c499d45c6bea8d7bbbb7a819c53fe9766136bf29)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:20 -07:00
Stefano Sabatini
e4a49ae561 doc/texi2pod.pl: skip printing chapter names if they are disabled 
(cherry picked from commit c838701ce4515bd51f7827be0b20f256ba5c69f3)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:20 -07:00
Stefano Sabatini
1feef46b90 doc/codecs: fix dangling reference to codec-options chapter 
(cherry picked from commit b4bd21b7fe2ad8be59b16538448586814e5db65b)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/codecs.texi
	doc/encoders.texi
 2013-08-28 09:35:20 -07:00
Stefano Sabatini
19382a2a10 doc/filters: review introductory example and explanation 
In particular, fix wrong vertical mirroring command, and clarify
and extend explanation.

Based on a patch by littlebat <dashing.meng@gmail.com>.

Should fix trac ticket #2413.
(cherry picked from commit 215ca864759a54f45265a51ac57dbfd75cb23da2)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/filters.texi
 2013-08-28 09:35:20 -07:00
Timothy Gu
57588cda7b doc/encoders: add libxvid doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 6b255e5e70c72aa59ff7aed74b4ee976223eb140)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/encoders.texi
 2013-08-28 09:35:20 -07:00
Timothy Gu
e5162b3bc9 doc/encoders: add libopus encoder doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 561e05136f1cbe28a79af1940aa137f70281eef4)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/encoders.texi
 2013-08-28 09:35:20 -07:00
Timothy Gu
ee9a440f49 doc/muxers: Add AIFF doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 4ec46b1160eb549a551823c168905b43922add31)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:19 -07:00
Timothy Gu
5582cfd0e4 doc/decoders: document libopus decoder 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 7eb5288f17aad81d5bd1b4d3d46533e457df262c)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:19 -07:00
Timothy Gu
68c9f5cf64 doc/encoders: alphabetically list the encoders 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 934df3b0375743ae2b03168a4174edb9f88a6889)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/encoders.texi
 2013-08-28 09:35:19 -07:00
Timothy Gu
e36a005749 doc/decoders: Add libopencore-amrwb decoder doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 83647ace735d1707d4b28345ef77fefe525ea52e)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:19 -07:00
Timothy Gu
9fb9419b02 doc/decoders: Document libopencore-amrnb decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b43860ee0c27279f2fa020ea965c03d359f8f45c)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:19 -07:00
Timothy Gu
23633f4925 doc/decoders: Document libilbc decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8cdea50f6eee1271e24ff0c9590522f8323e87fe)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:19 -07:00
Timothy Gu
be5fef6e0d doc/decoders: Document libgsm decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c16496c3770fa083472ab86146c18dc96c1feea7)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:19 -07:00
Timothy Gu
e3e5779a04 doc/encoders: Add libopencore-amrnb doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ead06057acfcc43bcb99a63a7c58543007b2847)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:19 -07:00
Timothy Gu
46ecbef251 doc/decoders: Document libcelt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e3580449221c79cf611995dc7e2fcb61dd867d4c)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:18 -07:00
Timothy Gu
528dd54d15 doc/general: Make the license status of the Android libraries clearer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6fe419bf73146655961a373c734e9e4d8826c835)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:18 -07:00
Timothy Gu
ccdeedf22c doc/encoders: Add libvo-amrwbenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0ec65aa1046a4417d5c7dfcf8faeecde60e3fe00)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Conflicts:
	doc/encoders.texi
 2013-08-28 09:35:18 -07:00
Timothy Gu
5c0dff6c60 doc/encoders: Add libvo-aacenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ba7cb4807f050c401f8fd7ef1d1065b138358135)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:18 -07:00
Timothy Gu
856bdcd5bc doc/encoders: add documentation for libtwolame 
(cherry picked from commit ea038b996d5662702b2247a6aa919dee1cebc0be)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:18 -07:00
Timothy Gu
a5fe40f728 doc/encoders: Add documentation for libmp3lame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4703a345fb41b14fe28f7e6bf7f60bb2213aa9e0)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-28 09:35:18 -07:00
Michael Niedermayer
b0558cd011 update all trac links to use the trac subdomain 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-15 02:34:35 +02:00
Michael Niedermayer
2e00dd4d62 Update for 1.1.5 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 00:59:36 +02:00
Michael Niedermayer
4fb6fa477e update for 1.1.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-14 17:39:57 +01:00
Michael Niedermayer
cdbaaa4f00 doc/ffmpeg: remove non ascii char 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-27 16:16:04 +01:00
David Favor
d4d1f32e48 Slight bug building ffmpeg-1.1.3 on OSX + patch to fix 
Two instances of non-ascii characters have crept into file
doc/filters.texi which causes pod2man to error out and
break the build.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-27 16:16:03 +01:00