virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
72,380 Commits 37 Branches 400 Tags 464 MiB
eff2ed2fde
Commit Graph

72380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
eff2ed2fde Merge commit '57cde2b180fcec0eaf60aad65f436ab6420546f5' 
* commit '57cde2b180fcec0eaf60aad65f436ab6420546f5':
  lavf: move TLS-related ifdeffery to library specific files

Conflicts:
	libavformat/network.c
	libavformat/tls.h
	libavformat/tls_openssl.c

See: a9f1d584e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 22:37:23 +02:00
wm4
a9f1d584e5 lavf: move TLS-related ifdeffery to library specific files 
There is no need to have this mess in network.c.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 22:24:00 +02:00
Michael Niedermayer
fbf9583f9f Merge commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125' 
* commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125':
  lavf: split tls.c

Conflicts:
	libavformat/tls.c
	libavformat/tls_gnutls.c
	libavformat/tls_openssl.c

See: 4a006b9eb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 22:17:17 +02:00
wm4
4a006b9eb7 lavf: split tls.c 
Move the OpenSSL and GnuTLS implementations to their own files. Other
than the connection code (including options) and some boilerplate, no
code is actually shared.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 21:48:47 +02:00
Michael Niedermayer
07fc47909f avformat/mpsubdec: Use double instead of float for timestamp calculations 
This provides higher precission

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 17:29:18 +02:00
Michael Niedermayer
f722009ad9 avformat/mp3dec: Ensure the buffer is large enough to avoid seeks from the first frame search 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 17:06:24 +02:00
wm4
2b3e9bbfb5 avformat/mp3: skip junk at the beginning of mp3 files 
Apparently it can happen that a mp3 file has junk data between id3 tag
and actual mp3 data. Skip this to avoid outputting nonsense timestamps.
(Two packets had the same timestamps, because the mp3 parser failed to
compute a frame duration.)

In this case, the junk consisted of 1044 bytes of zero, which
incidentally is the same size as normal mp3 frames in this stream. I
suspect the mp3 was edited with some tool which wiped the Xing/LAME
headers. Data near the end of the file suggests it was encoded with
"LAME3.97", but the normal Xing/LAME headers are missing. So this could
be "normal". mpg123 also attempts to skip at least 64KB of junk data by
scanning for headers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 15:50:04 +02:00
Michael Niedermayer
2ae0396814 avformat/mpsubdec: change multipler to int, it only stores 1 and 100 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 15:24:34 +02:00
周晓勇
e89e23e1bc avcodec: loongson3 optimized h264dsp weighted mc with mmi 
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 13:01:54 +02:00
Michael Niedermayer
1cf87e1680 doc/build_system: Document GEN, text taken from the webpage 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 12:23:01 +02:00
Michael Niedermayer
073f4b93b2 fate: Update exif tests after 09ec31ce3a 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 11:56:19 +02:00
Dave Rice
09ec31ce3a ffprobe: print stream_index with frame data 
This makes it easier to relate frame data to its associated stream.
 2015-05-27 11:19:19 +02:00
James Almer
c312bfac4c x86/cpu: add AV_CPU_FLAG_AVXSLOW flag 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-27 03:31:11 -03:00
Michael Niedermayer
52fc3e372f avfilter/x86/vf_hqdn3d: Fix register types 
Fixes Ticket4301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 05:18:55 +02:00
Michael Niedermayer
4240e6a921 avfilter/vf_hqdn3d: Initialize the whole LUT 
With bps > 8 more than 255..255 are used
The initialized table content is left unchanged,
But it could also be adjusted for the slight difference of
the maximum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 05:18:55 +02:00
Philip Langdale
7ae805db70 avcodec/nvenc: Fix typo: 1204 -> 1024 
Fixes Ticket4508

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-05-26 18:36:13 -07:00
Michael Niedermayer
023040ed0d avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user sets strict to -1 
Fixes Ticket4267

Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-27 01:47:59 +02:00
Michael Niedermayer
4fe38441b0 ffmpeg: do not print misleading recommanditions on 1pass vpx encoding 
Fixes part of Ticket4295

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 23:42:44 +02:00
Michael Niedermayer
4ae090f224 Merge commit 'cf1f3d837e1266034a487de5b575bd76426c6b10' 
* commit 'cf1f3d837e1266034a487de5b575bd76426c6b10':
  doc: Fix spelling of 'Transmission'

See: 9898bd9a82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 20:50:56 +02:00
wm4
57cde2b180 lavf: move TLS-related ifdeffery to library specific files 
There is no need to have this mess in network.c.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-26 21:48:51 +03:00
wm4
d8ffb2055f lavf: split tls.c 
Move the OpenSSL and GnuTLS implementations to their own files. Other
than the connection code (including options) and some boilerplate, no
code is actually shared.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-26 21:48:32 +03:00
Michael Niedermayer
cf86fd0069 avformat/matroskaenc: Avoid floats in default duration calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 20:42:05 +02:00
Michael Niedermayer
8aa9853093 avformat/ircamenc: Avoid floats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 19:54:41 +02:00
Michael Niedermayer
1fb9b2a283 avutil: Add av_q2intfloat() 
This function allows writing AVRationals as IEEE floats without the need
of platform dependant float operations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 18:31:53 +02:00
Michael Niedermayer
894d8cf418 avformat/movenc: Avoid floats & float rounding in tmcd nb_frames calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 14:51:00 +02:00
Michael Niedermayer
f902b0b2cb avformat/asfdec: Avoid float usage in duration calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 13:51:29 +02:00
Sebastian Ramacher
cf1f3d837e doc: Fix spelling of 'Transmission' 
Signed-off-by: Sebastian Ramacher <sramacher@debian.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-26 13:41:44 +02:00
Michael Niedermayer
db07fc2020 avformat/mpegts: Avoid float in bitrate calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 12:02:44 +02:00
Michael Niedermayer
1b236541a6 avcodec/h264: Fix HWACCEL_MAX for D3D11 
Found-by: philipl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 05:23:29 +02:00
Michael Niedermayer
688147cfe2 avcodec/hevc: Fix HWACCEL_MAX for D3D11 
Found-by: philipl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 05:23:29 +02:00
Michael Niedermayer
5cddfc5357 avcodec/dxva2_h264: Fix "may be used uninitialized" warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 05:23:29 +02:00
Philip Langdale
9ae766d1c6 avcodec/vdpau: Re-factor pre-hwaccel helper functions into separate header 
h264.h and hevc.h are mutually exclusive due to defining some of the same
names. As such, we need to avoid forcing h264.h to be included if we want
hevc decode acceleration to be possible.

However, some of the pre-hwaccel helper functions need h264.h. To avoid
messy collisions, let's move the declaration of all those helpers to
a separate header which we will exclude for the hevc support (which will
be hwaccel-only).

Signed-off-by: Philip Langdale <philipl@overt.org>
 2015-05-25 19:50:41 -07:00
Michael Niedermayer
7ed5d78d61 avcodec/dxva2: Fix "may be used uninitialized" warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 04:40:34 +02:00
Michael Niedermayer
a838b22bd9 configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va 
Fixes build with "mingw-w64-x86-64-dev 3.2.0-2"

Tested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 01:51:33 +02:00
Michael Niedermayer
5bc2c39527 avfilter/x86/vf_fspp: Fix invalid combination of opcode and operands 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-26 01:43:47 +02:00
Carl Eugen Hoyos
5193407cf6 lavf/dnxhd: Autodetect more files that can be decoded. 2015-05-26 00:29:36 +02:00
Andreas Cadhalpun
83a04f8cc1 mov: reject zero bytes_per_frame with non-zero samples_per_frame 
In this case the mov demuxer can return a large number of empty packets.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-26 00:28:02 +02:00
Michael Niedermayer
3232ac4bac configure: d3d11va is auto-detected like the others 
Fix the help text accordingly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 23:45:13 +02:00
Carl Eugen Hoyos
860ac0a5bb lavf/riff: Add 0x729A as TwoCC for G.729. 
Reported by forum user muchuan.
 2015-05-25 23:39:56 +02:00
Michael Niedermayer
94d07b314a avcodec/dxva2: Fix build without D3D11 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 22:24:40 +02:00
Michael Niedermayer
947b74ee7d Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772' 
* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772':
  D3D11va: add a Direct3D11 video decoder similar to DXVA2

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dxva2_vc1.c
	libavcodec/version.h
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 22:24:34 +02:00
Niklesh
9aabc926ca Improve upon dynamic arrays- movtext subtitles 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-05-25 11:39:29 -07:00
Andreas Cadhalpun
e48a9ac9af libshine: fix support for shine 3.0 
shine_encode_buffer expects written to be an int pointer, while the
previous shine_encode_frame expected it to be a long pointer.

Thus encoding with libshine currently always fails with
"internal buffer too small", because a negative return value of
shine_encode_buffer is interpreted as a very large long value.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-25 16:08:08 +02:00
Michael Niedermayer
c50904fd78 avcodec/mjpegenc_common: Use ff_mpv_reallocate_putbitbuffer() 
Fixes assertion failure
Fixes Ticket4396

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 14:35:35 +02:00
Michael Niedermayer
00f3bb2ef2 avcodec/mpegvideo: Factor ff_mpv_reallocate_putbitbuffer() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 14:33:38 +02:00
Michael Niedermayer
cf401cd12b avformat/rmenc: Avoid floats in duration calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 13:34:43 +02:00
Michael Niedermayer
343654c288 avformat/mpegenc: Replace *0.7 by *7/10 
This avoids another float computation, avoiding a potential source of
rounding issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 13:34:34 +02:00
Michael Niedermayer
73f7179924 avformat/mpegenc: Do not use floats for vcd_padding_bitrate 
This reduces the risk for rounding differences.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 12:43:51 +02:00
Michael Niedermayer
2ce6e41911 ffmpeg_opt: Set the video VBV parameters only for the video stream from -target 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-25 12:13:53 +02:00
Steve Lhomme
d8039ef8d2 D3D11va: add a Direct3D11 video decoder similar to DXVA2 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-25 11:47:08 +02:00