virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity
82,298 Commits 38 Branches 406 Tags
317be31eaf4f07b3bbeb703e8ee73d04b08a587c
Commit Graph

82298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rostislav Pehlivanov
317be31eaf opus: move the entropy decoding functions to opus_rc.c 
The intention is to have both encoding and decoding functions
in opus_rc.c.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-11-08 14:18:59 +00:00
Rostislav Pehlivanov
0660a09dd1 opus: move all tables to a separate file 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-11-08 14:18:59 +00:00
Vittorio Giovara
a765ba647d avformat/mov: Read multiple stsd from DV 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-08 14:07:41 +01:00
Reynaldo H. Verdejo Pinochet
6f0a1710d7 ffserver: use AVStream.codecpar in open_input_stream() 
AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-08 12:12:19 +01:00
Reynaldo H. Verdejo Pinochet
822e3e2ddb ffserver: user AVStream.codecpar in compute_status() 
AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-08 12:12:15 +01:00
Reynaldo H. Verdejo Pinochet
afcbadf0ed ffserver: use AVStream.codecpar in find_stream_in_feed() 
AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-08 12:12:12 +01:00
Reynaldo H. Verdejo Pinochet
1323349bef ffserver: get time_base from AVStream in print_stream_params() 
AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-08 12:12:09 +01:00
Reynaldo H. Verdejo Pinochet
689f648a95 ffserver: use .codecpar instead of .codec in print_stream_params() 
AVStream.codec is deprecated

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-08 12:12:04 +01:00
Reynaldo H. Verdejo Pinochet
311107a65d ffserver: check for codec match using AVStream.codecpar 
Compare using AVCodecParameters instead of the deprecated
AVStream.codec field

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-08 12:11:57 +01:00
Steven Liu
acd87dfc05 cmdutils: add show_demuxers and show_muxers 
add -muxers and -demuxers parameters to list the dexmuers and muxers

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-08 01:56:31 +01:00
Rostislav Pehlivanov
0cf6853804 aacenc: quit when the audio queue reaches 0 rather than keeping track of empty frames 
The libopus encoder does the same thing and its better than
keeping track of when the empty flush frames appear.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-11-08 00:50:51 +00:00
Michael Niedermayer
ef6a786401 ffserver: Fix one AVFormatContext misuse 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-07 20:41:44 +01:00
Andreas Cadhalpun
2c90316b46 hls: fix leaking avio_opts on hls_read_header error 
Use the hls_close function to reduce code duplication.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 19:44:41 +01:00
Andreas Cadhalpun
a305e0e5c0 hls: move hls_close above hls_read_header 
This is needed for the following commit.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 19:43:43 +01:00
Andreas Cadhalpun
5249706e9d mpegaudio_parser: don't return AVERROR_PATCHWELCOME 
The API does not allow returning AVERROR codes.

It triggers an assert in av_parser_parse2.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 19:41:17 +01:00
Michael Niedermayer
73ce1d864c ffserver: steal SPACE_CHARS, remove one reason for internal.h that way 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-07 19:27:40 +01:00
Michael Niedermayer
ecb40dee32 ffserver: eliminate hardcoded literal and duplicated array size 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-07 19:27:40 +01:00
Michael Niedermayer
10019c13e0 ffserver: use av_freep() for a case that is not clearly at the end of a function 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-07 19:27:40 +01:00
Michael Niedermayer
f67d22f0fd ffserver: Throw ffm.h out its not used except for a constant that is part of the format 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-07 19:27:40 +01:00
Michael Niedermayer
4c8d69e534 ffserver: drop a bunch of apparently unneeded internal headers 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-07 19:27:40 +01:00
Anssi Hannula
e2193b53ea avformat/hls: Add missing error check for avcodec_parameters_copy() 
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
 2016-11-07 18:56:36 +02:00
Anssi Hannula
3d2f636497 avformat/hls: Fix probing mpegts audio streams that use probing 
Commit 04964ac311 ("avformat/hls: Fix missing streams in some
cases with MPEG TS") caused a regression where subdemuxer streams that
use probing (e.g. dts/eac3/mp2 in mpegts) no longer get probed properly.

This is because the codec parameters from the subdemuxer stream, once
probed, are not passed on to the main stream.

Fix that by updating the codec parameters if the codec id changes.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
 2016-11-07 18:56:36 +02:00
Anssi Hannula
9a51cd35b8 avformat/hls: Factor copying stream info to a separate function 
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
 2016-11-07 18:56:36 +02:00
Andreas Cadhalpun
34aeb5dbc4 xmv: validate sample_rate 
AVCodecParameters.sample_rate is a signed integer, so
XMVAudioPacket.sample_rate should be, too.

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
54b8fbbc5d voc_packet: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
eb205eda3f oggparsespeex: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
f748e3b5a2 nuv: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
2c818c3821 mvdec: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
0747754622 mpeg4audio: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Also check for errors from avpriv_mpeg4audio_get_config in
ff_mp4_read_dec_config_descr.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
9d36602abc mov: validate sidx timescale 
A negative timescale doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
a398f054fd mov: validate time_scale 
A negative timescale doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
fc022e77ee mov: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

fate-aac-al07_96 fails if sample_rate == 0 is rejected in
ff_mov_read_stsd_entries.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
0009457dc0 ffmdec: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
872fcfcc0f bfi: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Andreas Cadhalpun
2eb05eaa68 adxdec: validate sample_rate 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-07 00:51:49 +01:00
Alex Agranovsky
88db6c2890 avfilter/vf_drawtext: fixed default/flt formatting ignoring offset parameter 
Signed-off-by: Alex Agranovsky <alex@sighthound.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-06 23:02:38 +01:00
fuqiuping
2d72ea68f0 avformat/flvenc: support mp3 audio with 48khz 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-06 22:46:25 +01:00
Michael Niedermayer
c6bc823eea avformat/tcp: Put struct sockaddr_in6 under #if 
Fixes: error: dereferencing pointer to incomplete type

Tested-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-06 21:29:12 +01:00
Michael Niedermayer
0e66dcd733 avfilter/af_volumedetect: Remove dependency on channel layout 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-06 16:59:20 +01:00
DeHackEd
6d50dff816 ffmpeg: parameters for filter thread counts 
Enables specifying how many threads are available to each filtergraph.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-06 15:27:25 +01:00
Derek Buitenhuis
b54fd42d7d doc/libx26[45]: Add documentation for forced-idr 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-06 15:26:08 +01:00
Stefano Sabatini
755472124f lavf/mpegtsenc: write metadata descriptor for timed ID3 packets 
This is required since some programs are not able to correctly recognize
the metadata. See H.222, 2.6.58 Metadata pointer descriptor.

putstr8() is modified in order to allow to skip writing the string
length.
 2016-11-06 12:36:51 +01:00
Stefano Sabatini
9ccdf04bd0 lavf/mpegtsenc: move putstr8 definition up 
This allows to use the function in a future commit.
 2016-11-06 12:36:43 +01:00
James Almer
75a13115cd avformat/mux: remove unnecessary autobsf hack 
autobsf has been ported to the new bsf API.

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-11-05 22:42:23 -03:00
James Almer
e8a39f584a avformat/framehash: also print channel layout as a string 
This should be more useful for users since numerical values for channel
layout can be confusing and unintuitive.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-11-05 22:42:22 -03:00
Michael Niedermayer
c3e0755663 MAINTAINERS: Replace QSV maintainer 
Ivan has a shortage of time to take care of QSV, Mark agreed to take over.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-06 01:50:05 +01:00
James Almer
9ea69f4808 avutil/softfloat_ieee754: make all functions inline 
Removes "defined but not used" warnings

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-11-05 17:53:26 -03:00
Andreas Cadhalpun
0efb610611 mxfdec: fix NULL pointer dereference 
Metadata streams have priv_data set to NULL.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-05 18:56:41 +01:00
Andreas Cadhalpun
bb6a7b6f75 lzf: update pointer p after realloc 
This fixes heap-use-after-free detected by AddressSanitizer.

Reviewed-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-11-05 18:56:26 +01:00
liu jc
c0f6eff6a7 avformat/tcp: workaround for IOS9 getaddrinfo in IPv6 only network use hardcode IPv4 address can not resolve port number. 
Signed-off-by: liujingchao <jcliu@outlook.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-05 18:48:00 +01:00