virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
34,907 Commits 37 Branches 400 Tags 460 MiB
4e7b3ef3b3
Commit Graph

34907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
4e7b3ef3b3 cinepak: Fix division by zero, ask for sample if encoded_buf_size is 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 15:19:57 +01:00
Mike Melanson
12d9a36481 Add another special case to the Cinepak video decoder so that it can handle the following file: 
http://samples.mplayerhq.hu/V-codecs/CVID/bad_cinepak_frame_size.mov

This fix works around another work around which handles a different type
of odd Cinepak data.

Thanks to Matthew Hoops (clone2727 - gmail.com) for the sample and fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 15:13:01 +01:00
Michael Niedermayer
974d25e2db mandelbrot: make mincol description and code match. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 15:13:01 +01:00
Clément Bœsch
16b809ce8e lavfi: fix misc typo in avfilter.h header. 2011-11-16 09:53:58 +01:00
Clément Bœsch
4da45aff28 cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
Clément Bœsch
df72ae673f swr: replace deprecated av_set_int() with av_opt_set_int(). 2011-11-16 07:27:20 +01:00
Clément Bœsch
ad561b5707 swr: replace deprecated av_opt_set_defaults2() with av_opt_set_defaults(). 2011-11-16 07:27:20 +01:00
Clément Bœsch
180aa82c1d swr: replace deprecated av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). 2011-11-16 07:27:20 +01:00
Clément Bœsch
f9368466c4 swr: use designated initializers for the class. 2011-11-16 07:27:20 +01:00
Clément Bœsch
7e516a11ca swr: rename resample2 to resample. 2011-11-16 07:27:20 +01:00
Clément Bœsch
fc42550097 swr: move format convert code to dedicated functions. 
This should easier common case optimizations.
 2011-11-16 07:27:20 +01:00
Michael Niedermayer
20431a9982 wma: Check channel number before init. 
Fixes Ticket240

Based on patch by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 03:37:44 +01:00
Michael Niedermayer
c1c836d9eb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: fix multiplication overflow in avformat_find_stream_info()
  cosmetics: indentation
  mpegaudiodec: init static tables in AVCodec.init_static_data()

Conflicts:
	libavcodec/mpegaudiodec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 02:27:31 +01:00
Michael Niedermayer
cd6851c5ef lavf: if timestamps are invalid (pts=dts) only drop dts. 
Because if we drop both we have no timestamps at all for some files.
Fixes Ticket344

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-16 01:25:42 +01:00
Mans Rullgard
52767d891c lavf: fix multiplication overflow in avformat_find_stream_info() 
Converting to double before the multiplication rather than after
avoids an integer overflow in some cases.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-15 23:41:04 +00:00
Stefano Sabatini
1c43713e57 ffprobe: add compact writer 2011-11-16 00:32:08 +01:00
Stefano Sabatini
0491a2a07a ffprobe: force display of missing fields, depending on writer.flags 
Add flags field to Writer, and define the
WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS flag which forces the display of
optional fields, for example non-available or invalid fields.

Also set the flag in the default writer.

This change is required as for some writers it is preferable to show all
fields (for example for avoiding a variable number of fields in CSV
output), while for other formats (e.g. JSON, XML) it is better to leave
invalid/unavailable fields unspecified and thus simplify the parsing
stage on the deserializer side.
 2011-11-16 00:30:35 +01:00
Michael Niedermayer
7776091b9f diracdec: obmc accesses arent aligned for all files. 
Thus use unaligned accesses.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 23:37:40 +01:00
Michael Niedermayer
d5e1244ca7 opt: Fix *av_opt_find2(NULL) 
Fixes Ticket650

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 22:43:21 +01:00
Michael Niedermayer
04bb26e3ee mandelbrot: add dither to convergence & mincol colorings. 
This avoids banding artifacts.
Note, low end TFTs still show some banding.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 21:33:11 +01:00
Michael Niedermayer
7575980ba4 mandelbrot: make mincol the default. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 20:04:25 +01:00
Michael Niedermayer
8d51cb4fb8 mandelbrot: add mincol inner coloring method. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 20:04:25 +01:00
Panagiotis H.M. Issaris
6f20921dee Fix seeking when using Apple HTTP Live Streaming 
The Apple HTTP Live Streaming demuxer's implementation of seeking searches for
the MPEG TS segment which contains the requested timestamp.  In its current
implementation it assumes that the first segment will start from 0.

But, MPEG TS streams do not necessarily start with timestamp (near) 0, causing
seeking to fail for those streams.

This also occurs when using live streaming of HTTP Live Streams. In this case
sliding playlists may be used, which means that in that case only the last x
encoded segments are stored, the earlier segments get deleted from disk and
removed from the playlist. Because of this, when starting playback of a stream
in the middle of such a broadcast, the initial segment fetched after parsing
the m3u8 playlist will not start from timestamp (near) 0, causing (the
admittedly limited live) seeking to fail.

This patch changes this demuxers seeking implementation to use the initial DTS
as an offset for searching the segments containing the requested timestamp.
 2011-11-15 18:35:03 +01:00
Justin Ruggles
f1d1516e55 cosmetics: indentation 2011-11-15 12:17:20 -05:00
Justin Ruggles
1158745a2d mpegaudiodec: init static tables in AVCodec.init_static_data() 2011-11-15 12:17:20 -05:00
Panagiotis H.M. Issaris
bf0ca404c6 Update my GnuPG fingerprint. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 18:13:59 +01:00
Michael Niedermayer
5a68b1ac3b mandelbrot: add inner drawing method to show converence time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 17:26:51 +01:00
Michael Niedermayer
5582e557e6 mandelbrot: add "fractal" to the description 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 17:26:46 +01:00
Michael Niedermayer
4c52adad69 mandelbrot: Fix "warning: passing argument 2 of ‘draw_mandelbrot’ from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 17:26:41 +01:00
Michael Niedermayer
53cb0de25b asfdec: mark only ts1 as av_unused 
Idea-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-15 13:06:36 +01:00
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