1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

34877 Commits

Author SHA1 Message Date
Michael Niedermayer
7ea3963817 mpegts: Completely ignore H222 spec and consider reserved adaption
fields to be perfectly fine mpeg TS.
Fixes Ticket580

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 04:15:34 +01:00
Michael Niedermayer
a72580fc9e 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>
2011-11-15 03:13:42 +01:00
Michael Niedermayer
be4c9a440f 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>
2011-11-15 02:25:19 +01:00
Michael Niedermayer
66cd3c12ab mpegaudio: prettify avpriv_mpa_bitrate_tab
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 01:59:59 +01:00
Michael Niedermayer
6760bd0a19 asfdec: avoid unused variable warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 01:58:13 +01:00
Michael Niedermayer
ba7f18876c asfdec: use dts for seeking.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 01:08:04 +01:00
Michael Niedermayer
bb4eabacea asfdec: restore timestamp reading code
This reverts part of:
	commit e65ab9d94f
	Author: Mans Rullgard <mans@mansr.com>
	Date:   Wed Jun 1 17:26:27 2011 +0100

	    Remove unused variables
2011-11-15 00:57:08 +01:00
Clément Bœsch
edc26bfae5 vda: use K&R style. 2011-11-15 00:41:36 +01:00
Stefano Sabatini
2b1a4c5b34 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).
2011-11-15 00:10:15 +01:00
Sebastien Zwickert
81852ef5d6 vda: get correctly the frame from h264 context. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
4590e161e6 vda: check allocation result. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
c7fa3eeab9 vda: removes useless casts. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
6e1e49385e vda: cosmetic. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
a40867f27b configure: add vda dependencies. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
b46134f659 vda: reordering headers inclusion. 2011-11-14 22:24:03 +01:00
Sebastien Zwickert
9837442a39 vda: undef Picture. 2011-11-14 22:24:02 +01:00
Clément Bœsch
c8136ebd6a 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
2011-11-14 22:11:28 +01:00
Michael Niedermayer
40176fc314 mp3enc: Try to use a matching bitrate in the xing header.
Might Fix Ticket431

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 20:59:28 +01:00
Michael Niedermayer
1fea432b7a mp3enc: simplify mp3_write_xing()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 20:52:42 +01:00
Michael Niedermayer
ecf5e70548 vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 18:29:37 +01:00
Michael Niedermayer
75c0ddc9c2 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>
2011-11-14 18:29:29 +01:00
Michael Niedermayer
6718536ba5 diracdec: fix empty data units.
Fixed Ticket636

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 18:14:20 +01:00
Mans Rullgard
3f5d6a665a binkvideo: simplify and remove invalid shifts
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-14 15:35:29 +00:00
Luca Barbato
2625b621ce 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.
2011-11-14 16:16:41 +01:00
Luca Barbato
caf27e37b6 lavf: simplify format_child_class_next()
And fix the error introduced when adding private option to avio.
See 32caa7b13c
2011-11-14 16:16:32 +01:00
Sebastien Zwickert
ac3dbb4d58 hwaccel: OS X Video Decoder Acceleration (VDA) support.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-11-14 16:07:32 +01:00
Clément Bœsch
07c7ffc04b Rename remaining get_le32 to avio_rl32. 2011-11-14 07:22:31 +01:00
Clément Bœsch
c142e2a00f Rename remaining get_le16 to avio_rl16. 2011-11-14 07:22:31 +01:00
Clément Bœsch
49651063da Use AVIOContext.seekable instead of deprecated url_is_streamed. 2011-11-14 07:22:31 +01:00
Clément Bœsch
7b79305a47 Rename remaining url_fskip to avio_skip. 2011-11-14 07:22:31 +01:00
Clément Bœsch
b04ee90043 Rename remaining av_metadata_set2 to av_dict_set. 2011-11-14 07:22:31 +01:00
Clément Bœsch
63b796b0dd Rename remaining url_ftell to avio_tell. 2011-11-14 07:22:31 +01:00
Clément Bœsch
055cda8acc Rename remaining get_byte to avio_r8. 2011-11-14 07:22:31 +01:00
Clément Bœsch
f3c47e4100 Rename remaining url_fsize to avio_size. 2011-11-14 07:22:31 +01:00
Clément Bœsch
53d70a334a Rename remaining get_buffer to avio_read. 2011-11-14 07:22:30 +01:00
Clément Bœsch
39edfcc9e8 Rename remaining url_fseek to avio_seek. 2011-11-14 07:22:30 +01:00
Clément Bœsch
eef3ea8c71 Rename remaining ByteIOContext to AVIOContext. 2011-11-14 07:22:30 +01:00
Michael Niedermayer
73af8ea356 mandelbrot: add math.h for log2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:56:03 +01:00
Michael Niedermayer
70eb58cd92 mandelbrot: avoid INFINITY as openbsd seems not to like it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:47:56 +01:00
Michael Niedermayer
b1b0fd2790 pad: fix format string length
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:42:10 +01:00
Janne Grunau
d8a091698a 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.
2011-11-14 01:12:15 +01:00
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