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
34,836 Commits 37 Branches 400 Tags 465 MiB
5f268ca5c5
Commit Graph

34836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
5f268ca5c5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: pass options from AVFormatContext to avio.
  avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
  avio: add avio_open2, taking an interrupt callback and options
  avio: add support for passing options to protocols.
  avio: add and use ffurl_protocol_next().
  avformat: Pass the interrupt callback on to chained muxers/demuxers
  avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
  avformat: Use ff_check_interrupt
  avio: Add an internal utility function for checking the new interrupt callback
  avio: Add AVIOInterruptCB
  texi2html: remove stray \n
  doc: prettyfy the texi2html documentation
  swscale: handle unaligned buffers in yuv2plane1

Conflicts:
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-14 00:33:39 +01:00
Clément Bœsch
4fa6e9d0b4 doc: replace an "avconv" reference with "ffmpeg" in indevs. 2011-11-13 23:35:57 +01:00
Clément Bœsch
9466237b8b doc: drop "./" binary prefixes. 2011-11-13 23:35:45 +01:00
Stefano Sabatini
3a9f2f1d65 vsrc_mandelbrot: set options through the opt framework 2011-11-13 21:31:23 +01:00
Giorgio Vazzana
c15400afc5 mandelbrot: remove always-false condition in fill_from_cache 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 19:41:21 +01:00
Michael Niedermayer
102db4f6e7 MAINTAINER: add libavfilter section and add myself to yadif & mandelbrot 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 19:33:34 +01:00
Michael Niedermayer
08dadd331f mandelbrot: allow visualizing the period of converged points. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 19:28:24 +01:00
Michael Niedermayer
e8499ab171 mandelbrot: Add inner variable & enum for inner coloring schemes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 19:26:22 +01:00
Michael Niedermayer
3cbe9afba5 mandelbrot: only check bailout once every 2 iterations. 
Once we bailed out we calculate the exact iteration in which it would have happened if needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 18:14:40 +01:00
Michael Niedermayer
41fd1b2d5a mandelbrot: add SQR() macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 18:14:10 +01:00
Giorgio Vazzana
e555119c73 mandelbrot: correct and simplify the formula used in NORMALIZED_ITERATION_COUNT 
Use log(sqrt(mb->bailout)) instead of log(mb->bailout) because mb->bailout represent
the bailout radius squared, and then simplify the two sqrt().
This is also slightly faster.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 17:33:09 +01:00
KO Myung-Hun
ad0bdd2fd2 lavc: add supports of OS/2 threads 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 17:33:09 +01:00
Michael Niedermayer
88166fc579 mandelbrot: unroll the innermost loop once. 
This allows us to remove a if() and a variable assignment.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 17:01:56 +01:00
Michael Niedermayer
1d06608732 mandelbrot: only check periodicity once for each period instead of twice. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 17:01:56 +01:00
Michael Niedermayer
2fee131b9e mandelbrot: use period detection depening on left pixel and not the 
previous calculated pixel, this is more accurate due to the last
calculated often being farther away.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 17:01:56 +01:00
Carl Eugen Hoyos
9117592549 Cosmetics: Increase readability. 2011-11-13 15:43:09 +01:00
Carl Eugen Hoyos
eb664d4ae3 Increase Westwood Studios VQA palette dynamics. 2011-11-13 15:12:43 +01:00
Carl Eugen Hoyos
1fc573dd25 Increase Sierra VMD palette dynamics. 2011-11-13 15:04:29 +01:00
Carl Eugen Hoyos
a95906af57 Increase Pictor/PC Paint palette dynamics. 2011-11-13 14:52:21 +01:00
Carl Eugen Hoyos
105cf82acb Increase FLI/FLC Animation palette dynamics for some samples. 2011-11-13 14:50:01 +01:00
Carl Eugen Hoyos
2b656844f8 Increase eXtended BINary text palette dynamics. 2011-11-13 14:42:22 +01:00
Carl Eugen Hoyos
942e9be5d7 Increase Bethesda VID palette dynamics. 2011-11-13 14:40:32 +01:00
Anton Khirnov
32caa7b13c lavf: pass options from AVFormatContext to avio. 2011-11-13 13:21:46 +01:00
Martin Storsjö
9d77a8faf9 avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-13 13:20:49 +01:00
Martin Storsjö
1dee0aca74 avio: add avio_open2, taking an interrupt callback and options 
The interrupt callback has to be passed in during opening (setting it
after opening isn't enough), since a blocking open couldn't be
interrupted otherwise.

Options are passed down to procotols and also need to be available
during open() in most cases.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-13 13:17:04 +01:00
Anton Khirnov
ddffc2fdc3 avio: add support for passing options to protocols. 
Not used anywhere yet, support for passing options from avio_open() will
follow.
 2011-11-13 13:14:39 +01:00
Anton Khirnov
163a31136d avio: add and use ffurl_protocol_next(). 2011-11-13 13:14:14 +01:00
Martin Storsjö
6ef350c16b avformat: Pass the interrupt callback on to chained muxers/demuxers 
There are a few more cases of chained demuxers, but they
only use custom IO which don't do any blocking IO and thus
don't need the callback.
 2011-11-13 13:13:57 +01:00
Martin Storsjö
6f1b7b3944 avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc 
Change all uses of these function to pass the relevant
callback on.
 2011-11-13 13:12:17 +01:00
Martin Storsjö
9957cdbfd5 avformat: Use ff_check_interrupt 2011-11-13 13:08:13 +01:00
Martin Storsjö
c4a090ddb5 avio: Add an internal utility function for checking the new interrupt callback 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-13 13:07:48 +01:00
Martin Storsjö
6aa0b98fb2 avio: Add AVIOInterruptCB 
This is a better io interrupt callback function, which has an
opaque parameter, which is given to the interrupt callback.

This allows callers to precisely cancel IO for one single
AVFormatContext, without interrupt other ones in the same
process.

Note, it's not needed in AVIOContext, at the moment.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-11-13 12:59:56 +01:00
Luca Barbato
58b68d6b36 texi2html: remove stray \n 
Single-quoted strings are printed verbatim in perl.
 2011-11-13 12:42:39 +01:00
Luca Barbato
84fb63ed23 doc: prettyfy the texi2html documentation 
make it use the website css and start structuring it so it is consistent
 2011-11-13 12:00:44 +01:00
Ronald S. Bultje
8283f90a52 swscale: handle unaligned buffers in yuv2plane1 
The issue had been introduced in
c435653627

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-11-13 08:27:20 +01:00
Michael Niedermayer
46eae15567 mkvtimestamp v2 muxer: rename so as to avoid confusion with SMPTE timecodes. 
Requested-by: Baptiste Coudurier
Approved-by: David Conrad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 05:19:28 +01:00
Michael Niedermayer
17c95361e9 mkvtimestamp v2 muxer: remove unneeded prefixes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 05:16:54 +01:00
Carl Eugen Hoyos
7ea77a6197 Set some Pictor/PC Paint palettes opaque. 2011-11-13 03:08:25 +01:00
Carl Eugen Hoyos
0d49dd3725 Set more KMVC palettes opaque. 2011-11-13 03:01:30 +01:00
Carl Eugen Hoyos
789da2e9f1 Set second Delphine Software International CIN palette opaque. 2011-11-13 02:47:47 +01:00
Carl Eugen Hoyos
b3c67372a5 Force opaque alpha channel for 32bit x11grab image. 
Fixes ticket #163.
Approved-by: Clemens Fruhwirth
Approved-by: Edouard Gomez
 2011-11-13 02:02:06 +01:00
Giorgio Vazzana
be97e7b9c2 mandelbrot: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 01:27:30 +01:00
Giorgio Vazzana
459bba58d2 mandelbrot: add missing options to the parsing code 
The following options were added: end_scale, end_pts, bailout, outer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 01:27:30 +01:00
Michael Niedermayer
545ec935a4 h264: Use mismatching frame numbers in fields to synchronize the 
first/second field state independant of them being reference or not.
Fixes Ticket354

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-13 01:27:18 +01:00
Dominique Leuenberger
05423d3afd RELEASE: bump to 0.8.6.git after the release 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-12 21:00:13 +01:00
Dominique Leuenberger
8a25d0a860 Trivial: j2kenc: fix compiler warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-12 21:00:12 +01:00
Giorgio Vazzana
6024bdb21a mandelbrot: fix sscanf format string 
Replace ',' with ':'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-12 21:00:12 +01:00
Carl Eugen Hoyos
3230c756f8 Increase Bitmap Brothers JV palette dynamics. 
Approved-by: Peter Ross
 2011-11-12 20:56:07 +01:00
Carl Eugen Hoyos
9780c33eca Increase Psygnosis YOP palette dynamics. 2011-11-12 20:49:53 +01:00
Carl Eugen Hoyos
ac0042f55f Set Psygnosis YOP palette opaque. 2011-11-12 20:48:39 +01:00