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
48,397 Commits 37 Branches 400 Tags 460 MiB
82deb0c42e
Commit Graph

48397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
82deb0c42e doc/muxers: adopt new -codec:SPEC syntax in segment example 2013-01-02 16:30:11 +01:00
Stefano Sabatini
8bbe9d90fa doc/muxers: add a dedicated section for segment examples 2013-01-02 16:29:58 +01:00
Stefano Sabatini
fd44dfb29d doc/muxers: fix typos in the segment chapter 2013-01-02 16:29:42 +01:00
Clément Bœsch
8bc74221f8 lavf: remove generic index flag from text subtitles. 
This flag is not necessary.
 2013-01-02 10:32:21 +01:00
Clément Bœsch
5a2f3f0bca lavf/vobsub: do not count trailing NUL char in extradata. 
See 36e61e24.
 2013-01-02 09:31:07 +01:00
Michael Niedermayer
1e28fa21de rawdec: fix NV12 
Fixes Ticket646

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-02 03:56:57 +01:00
Janne Grunau
e9fd51b0d6 h264: check SPS entries directly to detect pixel format changes 
Comparing AVCodecContext.pix_fmt against the get_pixel_format() return
value has the side effect of calling the get_format() callback on each
slice. Users of the callback will probably handle hardware accelerator
initialization in the callback.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-02 02:28:57 +01:00
Michael Niedermayer
341e40f1e1 lavf: Fix codec id forcing with probed codecs 
Fixes Ticket2088

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-02 01:17:36 +01:00
Michael Niedermayer
3a6b6f425e lavf: move force_codec_ids() up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-02 01:17:36 +01:00
Nicolas George
98ce9b8468 fate: merge mapchan and options into ffmpeg. 
They were two very short files that cover ffmpeg-specific features.
 2013-01-01 23:48:41 +01:00
Nicolas George
102cf964dd ffmpeg: sub2video: set resample size. 
Necessary after 04a530f.
 2013-01-01 23:06:34 +01:00
Nicolas George
5ed5e90f2a lavc/dvdsubenc: improve color distance function. 
Consider the color space as an hypercone with apex alpha=0
and base alpha=1 instead of an hypercube.
Make the encoder consider very transparent colors more similar
even if the hue is very different.
This corresponds roughly to using the alpha as a weight for the
color difference.
Only 4 bits of alpha are used, because this is what dvdsub uses,
and it avoids overflows.

Fix trac ticket #2005.
 2013-01-01 20:07:37 +01:00
Nicolas George
8dbbaf568e lavf/matroskaenc: respect bitexact for attachments. 
Use the first 64 bits of the SHA1 of the content as file UID
instead of a random number if the bitexact flag is set.
 2013-01-01 19:43:21 +01:00
Nicolas George
5bab99baea ffmpeg: apply flags to attachments too. 2013-01-01 19:43:21 +01:00
Nicolas George
951a03b3a8 ffmpeg: move stream_copy flags handling after attachments. 2013-01-01 19:43:20 +01:00
rogerdpack
10a9277562 better filter error message when accidentally reusing outputs 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-01 19:39:10 +01:00
Nicolas George
ecda1d3cbe lavf: add data: URI scheme. 2013-01-01 19:29:04 +01:00
Paul B Mahol
ba1cbf40ce lavfi/lut: use ff_fill_rgba_map() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-01 17:07:57 +00:00
Piotr Bandurski
fde13052fb aiffdec: set block duration for QDM2 
Fixes #1697.
 2013-01-01 17:03:22 +00:00
Clément Bœsch
7d66bc7920 lavc/movtextdec: keep the min size instead of max to fix overread. 
Fixes Ticket #2087.
 2013-01-01 16:41:37 +01:00
Clément Bœsch
1dd4a21cb7 fate: re-enable fate-sub-mpsub. 
This reverts commit 580ee973d1.
 2013-01-01 16:34:00 +01:00
Clément Bœsch
c14f8a52b0 lavf/mov: fix timecode track reference usage. 2013-01-01 16:20:10 +01:00
Clément Bœsch
8d398f40b4 lavf/mov: simplify timecode track ref. 
There can be only one track reference. The multiple tref handling is
handled at a different level.
 2013-01-01 16:20:10 +01:00
Nicolas George
69a1667b06 ffmpeg: mark attachment streams finished. 
Fix trac ticket #2083.
 2013-01-01 16:05:35 +01:00
Michael Niedermayer
9b53306178 cmdutils: we have 2013 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-01 15:43:37 +01:00
Nicolas George
82541d8330 lavfi: merge all filtering code into ff_filter_frame. 2013-01-01 15:19:04 +01:00
Hendrik Leppkes
765158dd82 mov: fix parsing of the chap atom. 
This was broken in 0d96ec19eb under the
assumption that there is only one tref leaf atom.

Fixes Ticket #2081.
 2013-01-01 15:16:37 +01:00
Paul B Mahol
8c33cb5c77 fate: add nistsphere demuxer test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-01 14:02:54 +00:00
Michael Niedermayer
9336a980bb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtmp: Add support for limelight authentication
  rtmp: Add support for adobe authentication

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-01 14:04:50 +01:00
Paul B Mahol
8e4e532bb2 lavfi/avcodec: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-01 12:57:07 +00:00
Michael Niedermayer
c047a41bc5 Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a' 
* commit '33f28a3be3092f642778253d9529dd66fe2a014a':
  rtmp: Add a function for writing AMF strings based on two substrings
  rtmp: Return a proper error code in handle_invoke_error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-01 13:54:22 +01:00
Clément Bœsch
d079d1d368 ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
Clément Bœsch
c1abfcd7d6 doc/resampler: remove .html from link text. 2013-01-01 10:59:51 +01:00
Michael Niedermayer
13131685f1 ffmpeg: avoid negative timestamps for DVD 
dvdauthor cannot handle files with ts wraps

Fixes ticket383

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-01 04:59:03 +01:00
Nicolas George
2eb2e1798e lavfi: add avfilter_get_audio_buffer_ref_from_arrays_channels. 
It is the same as avfilter_get_audio_buffer_ref_from_arrays
except it has a "channels" and the channel layout can be 0.
 2013-01-01 02:01:28 +01:00
Michael Niedermayer
f105fe5c22 rawdec: fix decoding of odd dimensioned raw yv12 
Fix Ticket339 part 2 of 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-01 00:44:44 +01:00
Carl Eugen Hoyos
67abe21c0b mov: fix handling of odd sized yv12 
Part 1 of 2 to fix Ticket339

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-01 00:44:44 +01:00
Michael Niedermayer
6e8df250fd mpeg12: fix frame_pred_frame_dct handling in field pictures 
Fixes Ticket254

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-31 20:55:03 +01:00
Michael Niedermayer
49ec0d8ed2 mpeg12: print invalid cbp value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-31 20:55:02 +01:00
Michael Niedermayer
343900a147 mpeg12: print error for invalid skip cases 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-31 20:55:02 +01:00
Nicolas George
9e28e0035a lavc/flacenc: improve error return. 
Use meaningful error codes and add log messages.
 2012-12-31 19:11:12 +01:00
Nicolas George
11ab2c25b6 lavfi/avfiltergraph: print query_formats errors. 2012-12-31 18:43:04 +01:00
Nicolas George
5f12d5ad78 lswr: improve rematrixing error message. 
Report channel layout/count for insufficiently determined
rematrixing.
 2012-12-31 18:43:04 +01:00
Michael Niedermayer
08196c785a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: suppress -fPIC in msvc builds
  Drop unnecessary 'l' length modifier when printfing double values.
  truemotion2: Sanitize tm2_read_header()

Conflicts:
	libavcodec/truemotion2.c
	libavfilter/src_movie.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-31 14:20:01 +01:00
Michael Niedermayer
98275283d5 Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01' 
* commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01':
  FATE: add cavs test
  cavsdec: export picture type in the output frame

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-31 13:53:21 +01:00
Michael Niedermayer
ca95d1b32d Merge commit '7d8482640058d66867602a6f58446c9342d9d146' 
* commit '7d8482640058d66867602a6f58446c9342d9d146':
  cavs: deMpegEncContextize

Note, the bugfixes have all been in FFmpeg previously, this just switches away
from MpegEncContext

Conflicts:
	libavcodec/cavs.c
	libavcodec/cavsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-31 13:38:01 +01:00
Michael Niedermayer
6ddda83c3f Merge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8' 
* commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8':
  cavs: cosmetics, reformat top part
  cavsdec: cosmetics, reformat
  libavcodec/utils: Add braces to shut up gcc warnings

Conflicts:
	libavcodec/cavsdec.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-31 13:14:06 +01:00
Clément Bœsch
87350d6b44 lavc/textdec: fix subviewer1 preproc check. 2012-12-31 13:06:29 +01:00
Martin Storsjö
c1ea44c54d rtmp: Add support for limelight authentication 
Limelight is a not too uncommon CDN. The authentication scheme is
pretty similar to the adobe authentication, but is even closer to
normal http digest authentication (but not close enough to warrant
sharing code) than the adobe version.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-31 13:39:09 +02:00
Martin Storsjö
08225d0126 rtmp: Add support for adobe authentication 
This is mostly used to authenticate the client when publishing.
Tested with wowza and akamai.

Some but not all servers support resending a new connect invoke
within the same connection, so always reconnect for sending a new
connection attempt. This matches what other applications do as well.

The authentication scheme is structurally pretty similar to http
digest authentication, but uses base64 instead of hex strings.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-31 13:39:08 +02:00