ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-30 10:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,881 Commits 37 Branches 399 Tags 501 MiB
b33369b612
Commit Graph

81881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul B Mahol
4d677c7ae3 avformat/msf: add support for ATRAC3 codec 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-15 16:59:31 +02:00
Moritz Barsnick
022260271b libavcodec/qsvdec_h2645.c: drop executable permission 
Accidentally set in b93e223315.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
 2016-09-15 15:52:39 +02:00
Martin Storsjö
f8a13c7213 lavf/rtsp: Fix a crash with the RTSP muxer. 
Introduced in 00e122bc / bc2a3296
The whole block that the statement was added to is only
relevant when used as a demuxer, but the other statements
there have had other if statements guarding them. Make
sure to only run this whole block if being used as a
demuxer.

Fixes ticket #5844.
 2016-09-15 13:50:57 +02:00
Nikolas Bowe
96cd6f672e avcodec/(e)ac3: Fix target_level for EAC3. 
Currently when using target_level with EAC3 it produces silence. This small patch fixes target_level for decoding EAC3.

Example:
ffmpeg -y -i /tmp/test.wav -acodec eac3 -dialnorm -14 -ac 6 -b:a 384000 /tmp/test.m2ts
ffmpeg -y -target_level -24 -i /tmp/test.m2ts -acodec pcm_s16le -f matroska /tmp/out.mkv
ffplay /tmp/out.mkv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-15 12:18:55 +02:00
Michael Niedermayer
6f062eb8d0 avformat/hlsenc: Emulate strftime("%z") using other functions if it does not work 
This should fix the code on windows

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-15 02:31:42 +02:00
Vittorio Giovara
76c28360b5 vf_colorspace: Add modern names for color range option 
Allows to use values returned from API and from ffprobe directly.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-09-14 17:24:22 -04:00
Paul B Mahol
92dbd65700 avcodec/h264_parser: fix for possible overflow 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-14 21:14:07 +02:00
Paul B Mahol
01fa4fb69e avcodec/h264_parser: set missing pts for top/bottom field frames 
Adopted from 4eb49fdde8 revert.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-14 20:32:24 +02:00
Carl Eugen Hoyos
93e041026f lavc: Enable a53cc by default for x264 and qsv_h264. 2016-09-14 17:52:50 +02:00
Michael Niedermayer
a5af1240fc avcodec/g726: Add missing ADDB output mask 
Fixes: 1.poc
Fixes out of array read

Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-14 15:50:07 +02:00
Xinzheng Zhang
ecc04b4f2f avformat/utils: fix timebase error in avformat_seek_file() 
When there is only one stream and stream_index has not specified,
The ts has been transferd by the timebase of stream0 without modifying the stream_index
In this condation it cause seek failure.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-14 15:50:07 +02:00
Steven Liu
c8528e54e5 avformat/flvenc: add no_sequence_end flags for flvflags 
when split flv file by flv format at first, and cat flvs file
into one flv file, the flv sequence end is be used,
then the whole flv have many flv sequence end TAG.
this flags can give user an option to ignore write sequence end TAG

Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-14 15:50:07 +02:00
Michael Niedermayer
e85c4a4706 avformat/flvenc: Add () around & 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-14 15:50:07 +02:00
Clément Bœsch
415f907ce8 lavf/utils: add missing ismv in MOV-like formats 2016-09-14 10:00:08 +02:00
Clément Bœsch
9112822e71 lavf/utils: simplify matching MOV-like formats 2016-09-14 09:59:22 +02:00
Clément Bœsch
ae1dd0c9a6 lavf: add avformat_transfer_internal_stream_timing_info() and use it in ffmpeg 
In lavf we have access to st->internal->avctx so it's a better place
than in ffmpeg*.c and will allow moving to codecpar.
 2016-09-14 09:57:55 +02:00
Jon Toohill
7f386bbe2a ffmpeg: copy trailing_padding when using -acodec copy 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-09-13 23:59:41 -03:00
Steven Liu
84aebfc74e avformat/flvenc: add FLVFlags for flvflags options 
add FLVFlags type, be used to add new FLVFlags options

Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-14 01:45:40 +02:00
Michael Niedermayer
9f18a970b2 avformat/hlsenc: Assume UTC if "%z" is unsupported in strftime() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-13 23:44:35 +02:00
Michael Niedermayer
22ba9a3cb8 avformat/hlsenc: Avoid "%T" "%F" in strftime() to improve compatibility 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-13 23:44:35 +02:00
Marton Balint
025db5afaf avfilter/af_amerge: allow merging 1 input only 
Useful when the amerge filter parameters are generated from a script based on
the number of input streams, by allowing 1 input it does not have to be handled
specially.

The split filter also allows 1 output, so it is more consistent to allow
merging 1 input as well.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-09-13 21:35:31 +02:00
Vittorio Giovara
d41bfa9c0b vf_colorspace: Add BT-names for gamma22/28 transfer option 
Allows to use values returned from API and from ffprobe directly.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2016-09-13 10:22:23 -04:00
Jonathan Campbell
c19da0cfd8 avcodec/mpeg12dec: add comments documenting the format of the DVD CC user-data packet. 
this is to aid development and maintenance of that code.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-13 04:53:28 +02:00
Rodger Combs
1f6d7eb470
lavf: add a flag to enable/disable automatic bitstream filtering 
This is mostly useful for muxers that wrap other muxers, such as dashenc
and segment. The actual duplicated bitstream filtering is largely harmless,
but delaying the header can cause problems when the muxer intended the header
to be written to a separate file.
 2016-09-12 21:50:32 -05:00
Michael Niedermayer
5e1bf9d8c0 avcodec/avpacket: clear side_data_elems 
Fixes null pointer dereference

Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-12 23:53:07 +02:00
Rodger Combs
dca03ec5f4
ass_split: reindent 2016-09-12 15:57:51 -05:00
Rodger Combs
3b32e1313c
ass_split: fix handling of streams with no [Events] or Format: line 2016-09-12 15:57:50 -05:00
Paul B Mahol
a50ca6b357 avfilter/vf_convolution: add slice threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-12 14:38:45 +02:00
Paul B Mahol
afeffd891f avfilter: add sobel and prewitt filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-12 14:38:45 +02:00
Paul B Mahol
b791d0e4e0 avfilter/vf_vaguedenoiser: calculate dimensions at init 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-12 14:38:45 +02:00
Paul B Mahol
dc669d5fbe avfilter/vf_vaguedenoiser: change thresholding to function pointers 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-12 14:38:45 +02:00
Michael Niedermayer
5bbffe3412 avcodec/h264_refs: Change default case to av_assert0() to suppress warning 
Should fix "libavcodec/h264_refs.c:372:13: warning: variable 'i' is used uninitialized whenever switch default is taken"

Found-by: durandal_17
Suggested-by: jkqxz
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-12 12:33:44 +02:00
Matthieu Bouron
025f75c3ad lavc/ffjni: do not error out if the last non-mandatory field/method cannot be found 2016-09-12 09:56:37 +02:00
Jens Ziller
bc7066fd5d libavcodec/mmaldec.c: set AVFrame interlaced_frame and top_field_first, AVCodecContext framerate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-12 01:14:07 +02:00
Jan Sebechlebsky
b7760dd8d4 avformat/tee: Use BSF list API 
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
 2016-09-12 00:06:17 +02:00
Michael Niedermayer
cb114ed464 avformat/mux: implement AVFMT_FLAG_SHORTEST 
This will allow fixing several bugs with the -shortest option

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-11 23:17:31 +02:00
Alex Converse
09317e3e06 ivfenc: Add VPX codec tags. 
This fixes remuxing VPX from MP4 without manually overwriting the tag.
 2016-09-10 16:40:47 -07:00
Paul B Mahol
97297fb144 avfilter/vf_overlay: inline yuv output formats 
Overall speedup ~10-20%

Tested-by: Michael on mingw32 mingw64 linux32 mips and arm
 2016-09-11 00:38:13 +02:00
Paul B Mahol
140a0485d3 avfilter/vf_overlay: split blend_image into functions for each overlay format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-11 00:27:01 +02:00
Michael Niedermayer
054f912c0d avfilter/avf_concat: Make independent of the channel layout 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-10 23:19:01 +02:00
Philip Langdale
4029f05c8b avcodec/cuvid: Always check for internal errors during parsing 
The cuvid parser is basically undocumented, and although you'd
think that a failed callback would result in the overall parse
call returning an error, that is not true.

So, we end up silently trying to keep going as if nothing is wrong,
which doesn't achieve anything.

Solution: check the internal error flag every time.
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
 2016-09-10 22:27:24 +02:00
Paul B Mahol
b257266ee8 avfilter/af_amix: use ff_all_channel_counts() instead of ff_all_channel_layouts() 
Adds support for filtering frames with unknown channel layouts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-10 13:05:31 +02:00
Rodger Combs
7c5fed15a8
lavc/Makefile: add missing ADPCM_THP_LE objs 2016-09-09 20:07:55 -05:00
Rodger Combs
1177e42121
lavc/Makefile: g729dec: fix missing file 2016-09-09 20:07:55 -05:00
Michael Niedermayer
ae7d4e17eb fate: Add copy-trac2211-avi test 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-10 00:50:36 +02:00
Michael Niedermayer
24b3918901 tests/fate-run.sh: Analyze file generated in transcode() 
This should be much more informative than a plain md5 difference

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-10 00:50:36 +02:00
Michael Niedermayer
68f4c2163e avformat/movenc: Check first DTS similar to dts difference 
Fixes assertion failure
Fixes: b84b53855a0b74560e64c6f45f505a13/signal_sigabrt_7ffff6ae7c37_3837_ef4e243ea5b4fa8d0becf4afe9166604.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-10 00:50:36 +02:00
Paul B Mahol
c784b5cfdc avfilter/vf_histogram: set foreground alpha if possible in destination format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-09-10 00:28:28 +02:00
Lou Logan
915abab25c doc/filters: add missing palette* options 
Introduced in b7e78c7 and 93ae68d.

Fixes #5835.

The paletteuse debug options that are not part of the official API are
not included (debug_kdtree and color_search).

Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-09-09 09:37:26 -08:00
Timo Rothenpieler
b91e0e5987 avcodec/cuvid: check for and warn about invalid pkt_timebase 2016-09-09 17:56:07 +02:00