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
79,605 Commits 37 Branches 400 Tags 460 MiB
a5a6621616
Commit Graph

79605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Buitenhuis
d76972b581 Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7' 
* commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7':
  examples/output: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:06:43 +01:00
Paul B Mahol
b62ed56e25 avcodec/shorten: properly handle bitshift > 31 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-11 13:14:55 +02:00
Michael Niedermayer
15fa01786c avformat/hdsenc: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Michael Niedermayer
0c9ad94e97 avformat/dashenc: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Michael Niedermayer
4104f18358 avformat/segment: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Michael Niedermayer
02d08da81f avdevice/caca: switch to codecpar 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 01:34:02 +02:00
James Almer
5501f58e52 fate: fix sample dependencies for fate-{a,v}filter tests 2016-04-10 18:31:05 -03:00
Derek Buitenhuis
972df59f4f Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70' 
This commit is a no-op. We want to do this ourselves since avplay and
ffplay differ quite a bit.

* commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70':
  avplay: convert do codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 21:49:56 +01:00
Derek Buitenhuis
bc91bc1d8b Merge commit '0705f5960c9d272cef1309c090000865b991c9c7' 
This commit is a no-op. We did this already in 9e0d1c00b5.

* commit '0705f5960c9d272cef1309c090000865b991c9c7':
  avplay: do not use AVStream.codec for decoding

Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
 2016-04-10 21:49:00 +01:00
Derek Buitenhuis
bbf5ef9dac Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a' 
This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.

* commit '15e84ed3f141c586e8cb78ed58365cf5a511108a':
  avconv: convert to codecpar

Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
 2016-04-10 21:47:26 +01:00
Derek Buitenhuis
6372c9dc99 Merge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d' 
This commit is a no-op. We already moved it here.

* commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d':
  avconv: switch opening decoders and encoders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 21:29:30 +01:00
Derek Buitenhuis
6f69f7a8bf Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 
* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 20:59:55 +01:00
Jakub Stachowski
60b75186b2 avcodec/wmalosslessdec: do not discard last frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-10 21:33:56 +02:00
Paul B Mahol
571aa7d25e avcodec/shorten: mark as AV_CODEC_CAP_SUBFRAMES 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-10 19:54:43 +02:00
Martin Vignali
b45d542ea6 fate/exr : add test for PXR24 Float and tile uncompress 2016-04-10 19:47:51 +02:00
Martin Vignali
2dd7b46132 avcodec/exr: fix channel detection 2016-04-10 19:24:15 +02:00
Carl Eugen Hoyos
7e1e25c2dc lavf/avio: Remove linebreak from https warning. 2016-04-10 15:39:13 +02:00
Michael Niedermayer
38a6242b27 avformat/mpegts: Remove unused argument from analyze() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-10 13:32:26 +02:00
Michael Niedermayer
ee7a642b0e avformat/mpegts: Check adaption field control in analyze() more instead of transport_error_indicator 
transport_error_indicator is not required to be 0

Fixes probing
Fixes Ticket 4862

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-10 13:32:25 +02:00
Paul B Mahol
0c90b2e013 avcodec/shorten: add support for AIFF packing, not bitexact 
Also report unsupported packing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-09 21:07:10 +02:00
Paul B Mahol
82ee37f1f3 avcodec/shorten: fix decoding of very large (>2048) block sizes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-09 19:51:16 +02:00
Carl Eugen Hoyos
b0c026a27f lavf/rawenc: Add a raw gsm muxer. 2016-04-09 11:44:50 +02:00
Carl Eugen Hoyos
56cb465b38 lavf/gsmdec: Add raw gsm autodetection. 
Fixes bug 555.
 2016-04-09 11:38:46 +02:00
Michael Niedermayer
d433623fba avcodec/pngdec: Fix alpha detection with skip_frame 
Fixes Ticket4816

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-09 01:10:58 +02:00
Matthieu Bouron
7abc8e7ae3 swscale/arm: add ff_hscale_8_to_15_neon 2016-04-09 00:16:56 +02:00
Paul B Mahol
dee138624f avcodec/shorten: fix decoding of files with number of samples lower than max_frame_size 
Note that support of very big block sizes is not currently supported at all due
too flawed logic in decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 23:45:09 +02:00
Paul B Mahol
c18fdc8692 avcodec/shorten: remove useless if condition and comment, reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 23:21:47 +02:00
Paul B Mahol
a4790e1890 avformat/nistshperedec: add support for mu-law as sample-byte-format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 22:34:38 +02:00
Paul B Mahol
966d43d778 avcodec/shorten: fix decoding of last frame 
Previously it would be always discarded.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 22:32:32 +02:00
Michael Niedermayer
6936c11533 fate: Add test for Ticket 2397 (dvdsub) 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-08 21:42:57 +02:00
Clément Bœsch
cab9661dba sws/aarch64/yuv2rgb: honor iOS calling convention 
y_offset and y_coeff being successive 32-bit integers, they are packed
into 8 bytes instead of 2x8 bytes.

See https://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARM64FunctionCallingConventions.html

> iOS diverges from Procedure Call Standard for the ARM 64-bit
> Architecture in several ways
[...]
> In the generic procedure call standard, all function arguments passed
> on the stack consume slots in multiples of 8 bytes. In iOS, this
> requirement is dropped, and values consume only the space required.
[...]
> Padding is still inserted on the stack to satisfy arguments’ alignment
> requirements.
 2016-04-08 17:58:43 +02:00
Paul B Mahol
259879d32d avformat/nistspheredec: fix silly bug 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 13:19:00 +02:00
Paul B Mahol
1490682bcb avcodec/pngenc: check return value of av_frame_copy() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 12:45:40 +02:00
Dmitriy
c3320a51df avcodec/pngenc: restore image size before copying frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 12:37:20 +02:00
Paul B Mahol
ae8a13c560 avcodec/shorten: if allocation fails reset max_frame_size 
Otherwise crash happens.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 09:59:05 +02:00
Paul B Mahol
3e99b377fc avcodec: remove "get_buffer() failed" message 
It is already provided by ff_get_buffer().

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 09:40:32 +02:00
Paul B Mahol
0c9490609d avformat: support shorten in nistshpere demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-07 22:15:41 +02:00
Mulvya
b7a776aa7b doc/filters: add drawtext example 
Show example which draws text at a random position, and switches positions every 30 seconds

Signed-off-by: Mulvya <mulvya@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-04-07 09:40:36 -08:00
F.Sluiter
3a9611d623 avfilter: add remap filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-07 14:02:46 +02:00
Michael Niedermayer
c169062073 swscale/utils: Remove unused variable 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-07 13:41:23 +02:00
Paul B Mahol
2d720069a9 avformat: add aix demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-07 09:08:53 +02:00
Martin Vignali
6d7f5667a0 avcodec/exr: enable mipmap, ripmap decoding 2016-04-06 13:12:22 +02:00
James Almer
374974886a fate: add missing filter-meta-4560-rotate0 dependencies 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-04-05 21:17:13 -03:00
Claudio Freire
8005b6de4f AAC encoder: fix valgrind errors 
Move wi.clipping computation outside of psy_lame_window, LFE
channels don't even call that, and make the LFE path also
initialize window_type[1] which is needed by analyze_channel
 2016-04-05 23:13:44 -03:00
Michael Niedermayer
2c697c650c fate: force fixed point aac decoder in filter-meta-4560-rotate0 
This should fix a off by 1 difference between AARCH64 and X86

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-06 03:16:33 +02:00
Derek Buitenhuis
fdd7a594c3 libxvid: Create extradata in init using a dummy frame 
Modifying global header extradata in encode_frame is an API violation
and only happens to work currently because mov writes its header
at the end of the file.

Heavily based off of a patch from 2012.

Original-by: Nicolas George <george@nsup.org>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-05 11:16:24 -04:00
Clément Bœsch
040598218f sws/aarch64: restore ff_hscale_8_to_15_neon() 
Fix final scaling and required filter alignment. Pass FATE.
 2016-04-05 12:00:36 +02:00
Paul B Mahol
56a3a3f01c avformat: add musx demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-05 10:49:34 +02:00
Paul B Mahol
8a4c3f5258 avcodec: add adpcm dat4 decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-05 10:48:59 +02:00
Claudio Freire
7d49abdf47 AAC encoder: fix filling of wi.clipping array 
Fill all windows in all window groups instead of only the first
window of each group.

Also avoid uninitialized access of window_type.
 2016-04-05 04:03:05 -03:00