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

45059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
ada4f4f715 doc/texi2pod: correctly handle @url commands in the form @url{URL,...} 
Ignore the other arguments, which have not to be processed by the POD
renderer.
(cherry picked from commit 1f9855dbc1)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-27 09:06:37 -07:00
Stefano Sabatini
7e017b9cbf doc/texi2pod: add support to @ifhtml and @ifnothtml directives 
With these commands it is possible to add HTML and non-HTML snippets,
which will be useful for the "See Also" manual chapters.
(cherry picked from commit f14e248783)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-27 09:06:36 -07:00
Nicolas George
deb9fb5257 doc/texi2pod: recognize @table @command. 
(cherry picked from commit ee2d6fbc92)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-27 09:06:36 -07:00
Stefano Sabatini
bb7f5e153e doc/texi2pod.pl: drop unnecessary rule, which was converting "\," to "," 
I cannot find a reason for such a rule, which was resulting in badly
escaped filtergraph snippets.

Fix trac ticket #1610.
(cherry picked from commit ce875a613a)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-27 09:06:36 -07:00
Timothy Gu
7364109d25 doc/encoders: Remove reference to "Codec Options" chapter 
The chapter is only presented in later release branches.
 2013-08-26 16:28:54 -07:00
Clément Bœsch
b2d6f63ed9 doc: remove mention of fifo filter in the introduction. 
It's confusing and not necessary, especially in the introduction.
(cherry picked from commit 80a9297b71)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 12:01:45 -07:00
Timothy Gu
cdfca17eb2 doc/encoders: add libxvid doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 6b255e5e70)

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

Conflicts:
	doc/encoders.texi
 2013-08-26 11:52:25 -07:00
Timothy Gu
2f1370da22 doc/muxers: Add AIFF doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 4ec46b1160)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:51:52 -07:00
Timothy Gu
d616b63039 doc/encoders: alphabetically list the encoders 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 934df3b037)

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

Conflicts:
	doc/encoders.texi
 2013-08-26 11:50:45 -07:00
Timothy Gu
b4bc355523 doc/decoders: Add libopencore-amrwb decoder doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 83647ace73)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:45 -07:00
Timothy Gu
ef5552a410 doc/decoders: Document libopencore-amrnb decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b43860ee0c)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:45 -07:00
Timothy Gu
7c23166dd3 doc/decoders: Document libilbc decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8cdea50f6e)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:44 -07:00
Timothy Gu
cb0707479c doc/decoders: Document libgsm decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c16496c377)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:44 -07:00
Timothy Gu
1c5129c7a0 doc/encoders: Add libopencore-amrnb doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ead06057a)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:44 -07:00
Timothy Gu
ff8e4d7f1b doc/decoders: Document libcelt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e358044922)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:44 -07:00
Timothy Gu
a191b3dbcc doc/general: Make the license status of the Android libraries clearer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6fe419bf73)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:44 -07:00
Timothy Gu
277502d109 doc/encoders: Add libvo-amrwbenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0ec65aa104)

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

Conflicts:
	doc/encoders.texi
 2013-08-26 11:50:44 -07:00
Timothy Gu
245e97ef61 doc/encoders: Add libvo-aacenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ba7cb4807f)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:44 -07:00
Timothy Gu
4c1544ecc8 doc/encoders: add documentation for libtwolame 
(cherry picked from commit ea038b996d)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:44 -07:00
Timothy Gu
a697a2795b doc/encoders: Add documentation for libmp3lame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4703a345fb)

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-08-26 11:50:41 -07:00
Michael Niedermayer
739e236aed swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output 
Fixes Ticket2859

Note, testcases related to the downmix channels are welcome.
(id like to make sure this is working correctly now, as obviously it didnt
 work before ...)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c56d4dab03)
 2013-08-20 18:47:27 +02:00
Michael Niedermayer
3f3993ac0a swr: clean layouts before checking sanity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6dfffe9200)
 2013-08-20 18:47:25 +02:00
Michael Niedermayer
b416cb979d movenc: ilbc needs audio_vbr set. 
Without this the block_align or bitrate value is not available to the decoder

Fixes Ticket2858

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3d64845600)
 2013-08-20 18:47:23 +02:00
Michael Niedermayer
24cff71d02 avcodec/kmvc: fix MV checks 
Fixes Ticket2813
Fixes regression since 70b5583

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3cd8aaa2b2)
 2013-07-31 03:01:17 +02:00
Michael Niedermayer
34dfb907b2 avformat/dtsdec: Improve probe, reject things looking like analog signals 
Fixes Ticket2810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6663205338)

Conflicts:
	libavformat/dtsdec.c
 2013-07-26 12:22:28 +02:00
Michael Niedermayer
b8b7373914 Merge remote-tracking branch 'jamrial/release/1.0' into release/1.0 
* jamrial/release/1.0:
  oggparseskeleton: avoid header parsing failure
  oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call
  oggparseskeleton: Fix fisbone header parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 01:17:41 +02:00
Justin Ruggles
d46713cc7e swfdec: do better validation of tag length 
Avoids trying to read a packet with 0 or negative size.
Avoids a potential infinite loop due to seeking backwards.

Partially based on a patch by Michael Niedermayer.
(cherry picked from commit e70c5b034c)

Conflicts:

	libavformat/swfdec.c
 2013-07-21 01:13:10 +02:00
Michael Niedermayer
9c7c2abad4 swfdec: check lens validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c73685398d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 01:13:10 +02:00
Michael Niedermayer
b896c1c98e update all trac links to use the trac subdomain 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 01:13:10 +02:00
Dale Curtis
858e06aabe avformat/utils: Keep internal and external av_read_frame() packets in sync. 
Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.

BUG=242786
TEST=ffmpeg_regression_tests

Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c54a1565f5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-21 01:13:10 +02:00
Michael Niedermayer
03983c3650 avformat/matroskadec: Detect conflicting sample rate/default_duration 
Fixes Ticket2508

Thanks-to: Moritz Bunkus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6158a3bcdf)
 2013-07-16 11:53:33 +02:00
Michael Niedermayer
ec268c24a7 mpeg12dec: avoid reinitialization on PS changes when possible. 
Fixes Ticket2574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 970c8df735)

Conflicts:
	libavcodec/mpeg12dec.c
 2013-07-09 00:45:38 +02:00
Michael Niedermayer
be23cee317 oggparseskeleton: avoid header parsing failure 
Based on description by James Almer and the xiph wiki

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9a6e814be7)
 2013-07-07 21:38:07 -03:00
James Almer
2d66486b8e oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call 
since there should not be more than one fisbone for a given stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 63d7684fef)

Conflicts:
	libavformat/oggparseskeleton.c
 2013-07-07 21:37:09 -03:00
James Almer
ddfff76397 oggparseskeleton: Fix fisbone header parsing 
start_granule should be applied to the stream referenced in the fisbone packet, not to the
Skeleton stream.
This was broken in d1f05dd183 and produced bogus warnings about
multiple fisbone in the same stream on files with more than one stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3960992f0a)
 2013-07-07 21:35:20 -03:00
Michael Niedermayer
40c521aec0 mmsh: dont close context on seeking failure 
Fixes Ticket2581

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4579a29c7)
 2013-07-07 21:42:10 +02:00
Michael Niedermayer
e68b62a014 avformat/mov: Fix duration of fragmented mov 
Fixes Ticket2757

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dc2a13aa80)
 2013-07-07 18:45:31 +02:00
Michael Niedermayer
8c5c4adebb libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE 
should fix ticket2755

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 707b2135fd)
 2013-07-07 18:45:03 +02:00
Michael Niedermayer
ee829bacde mpegts: only reopen pmt_cb filter if its different from the previous. 
Fixes Ticket2632

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b009267910)
 2013-07-07 18:44:48 +02:00
Michael Niedermayer
5fa940d9c7 rmdec: Pass AVIOContext to rm_read_metadata() 
Fix null pointer dereference
Fixes Ticket2588

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bf87908cd8)

Conflicts:
	libavformat/rmdec.c
 2013-07-07 18:44:22 +02:00
Hendrik Leppkes
491f2e517d mathops/x86: work around inline asm miscompilation with GCC 4.8.1 
The volatile is not required here, and prevents a miscompilation with GCC
4.8.1 when building on x86 with --cpu=i686

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 659df32a9d)
 2013-06-24 08:47:20 +02:00
Michael Niedermayer
8d18dbda1e avformat/libmodplug: Reduce the probe score for small input 
This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps
Fixes Ticket2583

Based on code by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c605adbf56)
 2013-06-21 01:16:06 +02:00
Carl Eugen Hoyos
dc3ec51601 Autodetect idcin only if audio properties allow decoding. 
Fixes ticket #2688.
(cherry picked from commit 06bede95fc)
 2013-06-19 23:47:05 +02:00
Michael Niedermayer
2ad70f57a8 swresample/x86/audio_convert: add emms to CONV 
Fixes ticket #1874

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ca2818b881)
 2013-06-18 02:53:59 +02:00
Michael Niedermayer
194590dc56 alacenc: Fix missing sign_extend() 
Fixes ticket #2497

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8aea2f05dc)
 2013-06-13 00:08:02 +02:00
Claudio Freire
be66531ee2 AAC encoder: Fix rate control on twoloop. 
Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.

Fixes ticket #2625.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-06-02 16:28:35 +02:00
Michael Niedermayer
d70043ea0f h264_cavlc: fix reading skip run 
Fixes Ticket2606

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 826b3a75cd)

Conflicts:
	libavcodec/h264_cavlc.c
 2013-05-30 23:18:11 +02:00
Michael Niedermayer
71e32a5ea4 avienc: Disallow the first frame to be skiped 
Fixes Ticket2386

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc0db8cf30)

Conflicts:
	libavformat/avienc.c
 2013-05-27 23:54:17 +02:00
Michael Niedermayer
0428594f47 smacker: remove av_clip_int16() 
Fixes Ticket2425

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2211c76287)
 2013-05-21 00:01:11 +02:00
Michael Niedermayer
14634f5b69 ffmpeg: free threads on error conditions. 
Fixes Ticket2562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1a36c756d8)
 2013-05-17 23:25:54 +02:00