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
54,812 Commits 37 Branches 400 Tags 460 MiB
9f31c1608c
Commit Graph

54812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a37e42b3ee Update back for git master 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 03:14:23 +02:00
Michael Niedermayer
2b8b2ba19f Changelog: replace next by 2.0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 02:47:10 +02:00
Michael Niedermayer
1ebb95d5f1 Update for 2.0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 02:15:43 +02:00
Luca Barbato
5eaed6d336 atrac3: fix error handling 
decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 02:15:43 +02:00
Eugene Dzhurinsky
09f59d6adf avformat/gif: Do not write GIF89a header if loop is set to -1. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 01:18:59 +02:00
Michael Niedermayer
9e214900ad Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: assume 0 stream start time if start time is unset in duration check
  ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:57:04 +02:00
Michael Niedermayer
49f441ea89 MAINTAINERS: Update which releases are supported 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:47:01 +02:00
Alexis Ballier
c3ca70204b codec_desc: fix typo in rv20 long_name. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:27:34 +02:00
Michael Niedermayer
3aa2257d24 doc/RELEASE_NOTES: add a note about AVISynth 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-10 00:24:04 +02:00
Michael Niedermayer
233177a4ec jpegdec: clear EOBRUN on restarts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 23:49:06 +02:00
Michael Niedermayer
1c032e94d0 jpegdec: give handle_rstn() a return code that indicates if restart did happen 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 23:45:31 +02:00
Michael Niedermayer
776155ca29 mjpeg_decode_scan: reset restart state 
Fixes Ticket2082
Fixes progressive/refinement + restart jpegs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 23:43:36 +02:00
Michael Niedermayer
e9be4675b8 doc/ffmpeg: document -override_ffserver 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 22:19:10 +02:00
Michael Niedermayer
325411a687 snowenc: check minimum resolution 
Fixes Ticket1855

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 21:10:45 +02:00
Marton Balint
f07cb53ab9 ffplay: assume 0 stream start time if start time is unset in duration check 
Fixes ticket #2103 and #2743.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-09 20:19:54 +02:00
Marton Balint
3886572a83 ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-07-09 20:19:54 +02:00
Piotr Bandurski
aa74810fc6 bitstream: fix a crash in case of oom 
fixes ticket #2766

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 19:41:22 +02:00
James Almer
193782216f vorbiscomment: Add support for embedded cover art 
Fixes ticket #2655

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 19:21:23 +02:00
James Almer
1e5bbbfcf3 lavf/flacdec: Share the function to parse cover art blocks 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 19:19:42 +02:00
Michael Niedermayer
f9d7431272 avformat/AVFormatContext: Move fields down to match the fork 
avconv uses private and internal fields from libavformat, we thus must
match the layout even of the fields marked non public.
Otherwise ffmpegs libavformat could not be used as a dropin replacement
on debian/ubuntu

The current soname of libavformat was not part of any release nor are any
fields marked public moved thus in theory
no installed shared lib ABI breakage should occur. Still the need for this
change is unfortunate and chilling.
If you installed shared libs from a recent development version of libavformat
that is more recent than the last release. You probably want to check or rebuild
applications that linked to it.

minor versions of avformat & avdevice are bumped to allow detecting this
as both use the updated struct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 19:06:32 +02:00
Michael Niedermayer
d5de123195 avfilter/graphparse: Fix build with --enable-incompatible-fork-abi 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 19:06:32 +02:00
Paul B Mahol
c5a1b18f18 lavfi/drawtext: add support for printing frame metadata 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-09 15:21:01 +00:00
Luca Barbato
87fb18c3e4 imc: Catch a division by zero 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 16:20:50 +02:00
Luca Barbato
4ecdb5ed44 qdm2: Conceal broken samples 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 15:57:46 +02:00
Luca Barbato
adadc3f244 qdm2: refactor joined stereo support 
qdm2 does support only two channels. Loop over the run once.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 15:57:32 +02:00
Michael Niedermayer
7d9cb12689 avcodec/wmaprodec: Check block_align 
Fixes undefined behavior
Its not known if this condition can be triggered through crafted input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 15:32:21 +02:00
Michael Niedermayer
694550f18e Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Force correct extradata for AVID AVCI50 in mov.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 13:04:51 +02:00
Michael Niedermayer
0dd99628ea ff_lpc_calc_coefs: assert that the type is levinson or cholesky 
Otherwise the code could misbehave (and there are no other types anyway)
Fixes CID700759

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 11:57:45 +02:00
Carl Eugen Hoyos
9a1ec1f2f2 Force correct extradata for AVID AVCI50 in mov. 
Fixes ticket #2106.

Reviewed-by: Kieran Kunhya
 2013-07-09 11:43:33 +02:00
Paul B Mahol
3c5071db88 lavfi/psnr: rename 's' parameter to match documentation 
Also removes some irrelevant lines in documentation.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-09 09:40:53 +00:00
Michael Niedermayer
d0a7933991 ffmpeg_opt: do not warn about unused gop_timecode 
The option is injected by generic code and being sometimes unused is normal.

Fixes Ticket2762

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 10:54:40 +02:00
Luca Barbato
12576afe20 adpcm: Write the correct number of samples for ima-dk4 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Luca Barbato
bbf6a4aa20 imc: Catch a division by zero 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Luca Barbato
22e76ec635 atrac3: set the getbits context the right buffer_end 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Luca Barbato
50cf5a7fb7 atrac3: Error on impossible encoding/channel combinations 
Joint stereo encoded mono is impossible.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Luca Barbato
874c8a17ac atrac3: fix error handling 
decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-07-09 10:49:29 +02:00
Michael Niedermayer
e914a21ada Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Rename the timestamp parameter to dts in write_hint_packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 10:07:23 +02:00
Michael Niedermayer
848295c2ee Merge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830' 
* commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830':
  movenc: Make sure the RTP hint tracks have nondecreasing DTS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 10:01:17 +02:00
Michael Niedermayer
00b1401df6 avcodec/h264_ps: try to support Ambarella AVC 
Fixes Ticket2763

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 05:21:26 +02:00
Matthew Heaney
509642b4bd WebM muxer writes WebVTT subtitle track 
The Matroska muxer now allows WebVTT subtitle tracks to be written
while in WebM muxing mode.

WebVTT subtitle tracks have four kinds: "subtitles", "captions",
"descriptions", and "metadata". Each text track kind has a distinct
Mastroska CodecID and track type, as described in the temporal
metadata guidelines here:

http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm

When the stream has codec id AV_CODEC_ID_WEBVTT, the stream packet is
serialized per the temporal metadata guidelines cited above. The
WebVTT cue is written as a Matroska block group. The block frame
comprises the WebVTT cue id, followed by the cue settings, followed by
the cue text.  (The block timestamp is synthesized from the cue
timestamp.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 03:09:12 +02:00
Michael Niedermayer
a20f049c2a avcodec/libvpxenc: make class names unique 
This should fix an infinite loop with -h full

Found-by: <Foofie>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 03:04:31 +02:00
Michael Niedermayer
d1e8d4b055 ffmpeg: Allow overriding ffservers input 
Fixes Ticket1970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 01:50:32 +02:00
Michael Niedermayer
d7fbe926d3 ffmpeg: move creation_time for ffserver setting up 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-09 01:50:32 +02:00
Paul B Mahol
a03e79ed5a lavfi: fix broken logic in metadata handling 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 20:13:56 +00:00
Michael Niedermayer
970c8df735 mpeg12dec: avoid reinitializtation on PS changes when possible. 
Fixes Ticket2574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 21:55:04 +02:00
Michael Niedermayer
7dee9c2268 tests/fate/filter-audio: update asyncts reference 
The new reference matches the one used by qatar

Fixes: fate-filter-asyncts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 19:44:27 +02:00
Paul B Mahol
19c8f22714 lavfi/rotate: switch to new drawutils 
Get rid of ugly hacks, also add support for more pixel formats.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:49 +00:00
Paul B Mahol
55c94f48ce lavfi/drawutils: fix planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:49 +00:00
Paul B Mahol
d2dd1e075c lavfi/pad: use FFSIGN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-08 16:40:48 +00:00
Alexandre Sicard
70b922f371 avformat/mov: read stream bitrates from isml manifest 
This allows to read a live isml movie and segment it using the
smoothstreaming muxer, which requires the bitrates to be known for each stream.

Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 17:36:45 +02:00