]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 15 Nov 2011 02:13:42 +0000 (03:13 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
binkvideo: simplify and remove invalid shifts
pulse: compute frame_duration once and fix it
lavf: simplify format_child_class_next()
hwaccel: OS X Video Decoder Acceleration (VDA) support.
doc: add support for an optional navigation bar in texi2html pages
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/vda.c
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/vda_internal.h
libavcodec/version.h
libavformat/options.c
libavutil/avutil.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Nov 2011 01:22:23 +0000 (02:22 +0100)]
mpeg4videodec: dont treat empty frames as errors for QMP4, it seems thats normal.
Fixes remaining complaints in Ticket560 possibly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Nov 2011 00:59:59 +0000 (01:59 +0100)]
mpegaudio: prettify avpriv_mpa_bitrate_tab
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Nov 2011 00:58:13 +0000 (01:58 +0100)]
asfdec: avoid unused variable warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Nov 2011 00:08:04 +0000 (01:08 +0100)]
asfdec: use dts for seeking.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Nov 2011 23:57:08 +0000 (00:57 +0100)]
asfdec: restore timestamp reading code
This reverts part of:
commit
e65ab9d94f1c8d8893e32d90467d9525625d306a
Author: Mans Rullgard <mans@mansr.com>
Date: Wed Jun 1 17:26:27 2011 +0100
Remove unused variables
Clément Bœsch [Mon, 14 Nov 2011 23:17:31 +0000 (00:17 +0100)]
vda: use K&R style.
Stefano Sabatini [Sun, 13 Nov 2011 22:51:06 +0000 (23:51 +0100)]
amovie: avoid crash in amovie_request_frame() if no samplesref is available
The crash occurrs when a frame is successfully decoded, but no decoded
data is immediately available (typically happens with ogg/vorbis).
Sebastien Zwickert [Mon, 14 Nov 2011 21:03:38 +0000 (22:03 +0100)]
vda: get correctly the frame from h264 context.
Sebastien Zwickert [Mon, 14 Nov 2011 20:56:16 +0000 (21:56 +0100)]
vda: check allocation result.
Sebastien Zwickert [Mon, 14 Nov 2011 20:35:18 +0000 (21:35 +0100)]
vda: removes useless casts.
Sebastien Zwickert [Mon, 14 Nov 2011 20:32:10 +0000 (21:32 +0100)]
vda: cosmetic.
Sebastien Zwickert [Mon, 14 Nov 2011 20:22:14 +0000 (21:22 +0100)]
configure: add vda dependencies.
Sebastien Zwickert [Mon, 14 Nov 2011 20:20:04 +0000 (21:20 +0100)]
vda: reordering headers inclusion.
Sebastien Zwickert [Mon, 14 Nov 2011 20:01:21 +0000 (21:01 +0100)]
vda: undef Picture.
Clément Bœsch [Mon, 14 Nov 2011 20:33:42 +0000 (21:33 +0100)]
swr: set the default used_ch_count value to zero.
This allows an appropriate behaviour when it is not specified (fallback
to the number of input channels).
Fixes Ticket523
Michael Niedermayer [Mon, 14 Nov 2011 19:57:30 +0000 (20:57 +0100)]
mp3enc: Try to use a matching bitrate in the xing header.
Might Fix Ticket431
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Nov 2011 19:45:02 +0000 (20:45 +0100)]
mp3enc: simplify mp3_write_xing()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Nov 2011 16:24:59 +0000 (17:24 +0100)]
vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Nov 2011 16:19:06 +0000 (17:19 +0100)]
vble: move 2nd pass bitreading into vble_restore_plane()
this improves data cache hits and speeds up grayscale only decoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Nov 2011 17:01:13 +0000 (18:01 +0100)]
diracdec: fix empty data units.
Fixed Ticket636
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 13 Nov 2011 15:25:53 +0000 (15:25 +0000)]
binkvideo: simplify and remove invalid shifts
Signed-off-by: Mans Rullgard <mans@mansr.com>
Luca Barbato [Mon, 14 Nov 2011 14:53:59 +0000 (15:53 +0100)]
pulse: compute frame_duration once and fix it
The frame duration was calculated without taking in account the
bytes per sample.
Thanks to Lorenzo Pistone <blaffablaffa@gmail.com> for pointing
the issue and providing an initial fix.
Luca Barbato [Mon, 14 Nov 2011 11:24:21 +0000 (12:24 +0100)]
lavf: simplify format_child_class_next()
And fix the error introduced when adding private option to avio.
See
32caa7b13cecca59213c73fa94dd683c2b003bfd
Sebastien Zwickert [Fri, 11 Nov 2011 14:48:21 +0000 (15:48 +0100)]
hwaccel: OS X Video Decoder Acceleration (VDA) support.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Clément Bœsch [Mon, 14 Nov 2011 00:37:06 +0000 (01:37 +0100)]
Rename remaining get_le32 to avio_rl32.
Clément Bœsch [Mon, 14 Nov 2011 00:36:32 +0000 (01:36 +0100)]
Rename remaining get_le16 to avio_rl16.
Clément Bœsch [Mon, 14 Nov 2011 00:33:28 +0000 (01:33 +0100)]
Use AVIOContext.seekable instead of deprecated url_is_streamed.
Clément Bœsch [Mon, 14 Nov 2011 00:28:05 +0000 (01:28 +0100)]
Rename remaining url_fskip to avio_skip.
Clément Bœsch [Mon, 14 Nov 2011 00:25:52 +0000 (01:25 +0100)]
Rename remaining av_metadata_set2 to av_dict_set.
Clément Bœsch [Mon, 14 Nov 2011 00:23:00 +0000 (01:23 +0100)]
Rename remaining url_ftell to avio_tell.
Clément Bœsch [Mon, 14 Nov 2011 00:19:56 +0000 (01:19 +0100)]
Rename remaining get_byte to avio_r8.
Clément Bœsch [Sun, 13 Nov 2011 23:54:10 +0000 (00:54 +0100)]
Rename remaining url_fsize to avio_size.
Clément Bœsch [Sun, 13 Nov 2011 23:53:50 +0000 (00:53 +0100)]
Rename remaining get_buffer to avio_read.
Clément Bœsch [Sun, 13 Nov 2011 23:52:55 +0000 (00:52 +0100)]
Rename remaining url_fseek to avio_seek.
Clément Bœsch [Sun, 13 Nov 2011 23:36:45 +0000 (00:36 +0100)]
Rename remaining ByteIOContext to AVIOContext.
Michael Niedermayer [Mon, 14 Nov 2011 04:56:03 +0000 (05:56 +0100)]
mandelbrot: add math.h for log2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Nov 2011 04:47:56 +0000 (05:47 +0100)]
mandelbrot: avoid INFINITY as openbsd seems not to like it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Nov 2011 04:42:10 +0000 (05:42 +0100)]
pad: fix format string length
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sun, 13 Nov 2011 18:32:35 +0000 (19:32 +0100)]
doc: add support for an optional navigation bar in texi2html pages
The navigation header for the web pages lives in a different repository.
Read it during documentation regeneration to use the same navigation bar
on all pages.
Michael Niedermayer [Sun, 13 Nov 2011 22:43:12 +0000 (23:43 +0100)]
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>
Clément Bœsch [Sun, 13 Nov 2011 22:34:11 +0000 (23:34 +0100)]
doc: replace an "avconv" reference with "ffmpeg" in indevs.
Clément Bœsch [Sun, 13 Nov 2011 22:33:22 +0000 (23:33 +0100)]
doc: drop "./" binary prefixes.
Stefano Sabatini [Sun, 13 Nov 2011 18:12:00 +0000 (19:12 +0100)]
vsrc_mandelbrot: set options through the opt framework
Giorgio Vazzana [Sun, 13 Nov 2011 12:51:09 +0000 (13:51 +0100)]
mandelbrot: remove always-false condition in fill_from_cache
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Nov 2011 18:33:34 +0000 (19:33 +0100)]
MAINTAINER: add libavfilter section and add myself to yadif & mandelbrot
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Nov 2011 18:28:24 +0000 (19:28 +0100)]
mandelbrot: allow visualizing the period of converged points.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Nov 2011 18:26:22 +0000 (19:26 +0100)]
mandelbrot: Add inner variable & enum for inner coloring schemes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Nov 2011 17:14:40 +0000 (18:14 +0100)]
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>
Michael Niedermayer [Sun, 13 Nov 2011 17:14:10 +0000 (18:14 +0100)]
mandelbrot: add SQR() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Sun, 13 Nov 2011 15:09:58 +0000 (16:09 +0100)]
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>
KO Myung-Hun [Tue, 1 Nov 2011 15:00:21 +0000 (00:00 +0900)]
lavc: add supports of OS/2 threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Nov 2011 15:55:28 +0000 (16:55 +0100)]
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>
Michael Niedermayer [Sun, 13 Nov 2011 15:37:55 +0000 (16:37 +0100)]
mandelbrot: only check periodicity once for each period instead of twice.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Nov 2011 14:14:25 +0000 (15:14 +0100)]
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>
Carl Eugen Hoyos [Sun, 13 Nov 2011 14:43:09 +0000 (15:43 +0100)]
Cosmetics: Increase readability.
Carl Eugen Hoyos [Sun, 13 Nov 2011 14:12:43 +0000 (15:12 +0100)]
Increase Westwood Studios VQA palette dynamics.
Carl Eugen Hoyos [Sun, 13 Nov 2011 14:04:29 +0000 (15:04 +0100)]
Increase Sierra VMD palette dynamics.
Carl Eugen Hoyos [Sun, 13 Nov 2011 13:52:21 +0000 (14:52 +0100)]
Increase Pictor/PC Paint palette dynamics.
Carl Eugen Hoyos [Sun, 13 Nov 2011 13:50:01 +0000 (14:50 +0100)]
Increase FLI/FLC Animation palette dynamics for some samples.
Carl Eugen Hoyos [Sun, 13 Nov 2011 13:42:22 +0000 (14:42 +0100)]
Increase eXtended BINary text palette dynamics.
Carl Eugen Hoyos [Sun, 13 Nov 2011 13:40:32 +0000 (14:40 +0100)]
Increase Bethesda VID palette dynamics.
Anton Khirnov [Sat, 5 Nov 2011 11:30:21 +0000 (12:30 +0100)]
lavf: pass options from AVFormatContext to avio.
Martin Storsjö [Sun, 6 Nov 2011 21:11:29 +0000 (23:11 +0200)]
avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Martin Storsjö [Sun, 6 Nov 2011 21:03:45 +0000 (23:03 +0200)]
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>
Anton Khirnov [Sat, 5 Nov 2011 09:04:04 +0000 (10:04 +0100)]
avio: add support for passing options to protocols.
Not used anywhere yet, support for passing options from avio_open() will
follow.
Anton Khirnov [Sat, 5 Nov 2011 10:42:13 +0000 (11:42 +0100)]
avio: add and use ffurl_protocol_next().
Martin Storsjö [Sun, 6 Nov 2011 20:55:40 +0000 (22:55 +0200)]
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.
Martin Storsjö [Sun, 6 Nov 2011 20:50:44 +0000 (22:50 +0200)]
avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
Change all uses of these function to pass the relevant
callback on.
Martin Storsjö [Sun, 6 Nov 2011 20:34:24 +0000 (22:34 +0200)]
avformat: Use ff_check_interrupt
Martin Storsjö [Sun, 6 Nov 2011 20:10:21 +0000 (22:10 +0200)]
avio: Add an internal utility function for checking the new interrupt callback
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Martin Storsjö [Sun, 6 Nov 2011 12:10:16 +0000 (14:10 +0200)]
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>
Luca Barbato [Sun, 13 Nov 2011 11:25:29 +0000 (12:25 +0100)]
texi2html: remove stray \n
Single-quoted strings are printed verbatim in perl.
Luca Barbato [Sun, 13 Nov 2011 03:05:13 +0000 (04:05 +0100)]
doc: prettyfy the texi2html documentation
make it use the website css and start structuring it so it is consistent
Ronald S. Bultje [Sun, 13 Nov 2011 04:40:41 +0000 (05:40 +0100)]
swscale: handle unaligned buffers in yuv2plane1
The issue had been introduced in
c435653627529e22d74214c2266f571255e404d6
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Wed, 26 Oct 2011 23:48:28 +0000 (01:48 +0200)]
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>
Michael Niedermayer [Wed, 26 Oct 2011 23:46:54 +0000 (01:46 +0200)]
mkvtimestamp v2 muxer: remove unneeded prefixes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 13 Nov 2011 02:08:25 +0000 (03:08 +0100)]
Set some Pictor/PC Paint palettes opaque.
Carl Eugen Hoyos [Sun, 13 Nov 2011 02:01:30 +0000 (03:01 +0100)]
Set more KMVC palettes opaque.
Carl Eugen Hoyos [Sun, 13 Nov 2011 01:47:47 +0000 (02:47 +0100)]
Set second Delphine Software International CIN palette opaque.
Carl Eugen Hoyos [Sun, 13 Nov 2011 01:02:06 +0000 (02:02 +0100)]
Force opaque alpha channel for 32bit x11grab image.
Fixes ticket #163.
Approved-by: Clemens Fruhwirth
Approved-by: Edouard Gomez
Giorgio Vazzana [Sun, 13 Nov 2011 00:01:51 +0000 (01:01 +0100)]
mandelbrot: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Sat, 12 Nov 2011 23:20:34 +0000 (00:20 +0100)]
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>
Michael Niedermayer [Sat, 12 Nov 2011 20:10:15 +0000 (21:10 +0100)]
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>
Dominique Leuenberger [Sat, 12 Nov 2011 19:35:34 +0000 (20:35 +0100)]
RELEASE: bump to 0.8.6.git after the release
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dominique Leuenberger [Sat, 12 Nov 2011 19:35:33 +0000 (20:35 +0100)]
Trivial: j2kenc: fix compiler warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Sat, 12 Nov 2011 12:10:06 +0000 (13:10 +0100)]
mandelbrot: fix sscanf format string
Replace ',' with ':'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:56:07 +0000 (20:56 +0100)]
Increase Bitmap Brothers JV palette dynamics.
Approved-by: Peter Ross
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:49:53 +0000 (20:49 +0100)]
Increase Psygnosis YOP palette dynamics.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:48:39 +0000 (20:48 +0100)]
Set Psygnosis YOP palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:47:33 +0000 (20:47 +0100)]
Increase AVS palette dynamics.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:46:58 +0000 (20:46 +0100)]
Set AVS palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:23:34 +0000 (20:23 +0100)]
Set Westwood Studios VQA palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:22:01 +0000 (20:22 +0100)]
Set Sierra VMD palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:21:07 +0000 (20:21 +0100)]
Set Beam Software VB palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:19:51 +0000 (20:19 +0100)]
Set TIFF default grascale palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:19:07 +0000 (20:19 +0100)]
Set Tiertex Limited SEQ palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:17:56 +0000 (20:17 +0100)]
Set Sun Rasterfile palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:16:43 +0000 (20:16 +0100)]
Set Smacker palette opaque.
Carl Eugen Hoyos [Sat, 12 Nov 2011 19:15:56 +0000 (20:15 +0100)]
Set RL2 palette opaque.