summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * lavf: move TLS-related ifdeffery to library specific fileswm42015-05-26
| | | | | | | | | | | | There is no need to have this mess in network.c. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf: move TLS-related ifdeffery to library specific fileswm42015-05-27
| | | | | | | | | | | | There is no need to have this mess in network.c. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125'Michael Niedermayer2015-05-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125': lavf: split tls.c Conflicts: libavformat/tls.c libavformat/tls_gnutls.c libavformat/tls_openssl.c See: 4a006b9eb7e7d736fd00e6045b5612978ef6404b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: split tls.cwm42015-05-26
| | | | | | | | | | | | | | | | 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>
* | lavf: split tls.cwm42015-05-27
| | | | | | | | | | | | | | | | 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>
* | avformat/mpsubdec: Use double instead of float for timestamp calculationsMichael Niedermayer2015-05-27
| | | | | | | | | | | | | | This provides higher precission Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: Ensure the buffer is large enough to avoid seeks from the ↵Michael Niedermayer2015-05-27
| | | | | | | | | | | | first frame search Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3: skip junk at the beginning of mp3 fileswm42015-05-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avformat/mpsubdec: change multipler to int, it only stores 1 and 100Michael Niedermayer2015-05-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: loongson3 optimized h264dsp weighted mc with mmi周晓勇2015-05-27
| | | | | | | | | | Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/build_system: Document GEN, text taken from the webpageMichael Niedermayer2015-05-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: Update exif tests after 09ec31ce3aab41407965e7a95b7d145702434c26Michael Niedermayer2015-05-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffprobe: print stream_index with frame dataDave Rice2015-05-27
| | | | | | | | This makes it easier to relate frame data to its associated stream.
* | x86/cpu: add AV_CPU_FLAG_AVXSLOW flagJames Almer2015-05-27
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter/x86/vf_hqdn3d: Fix register typesMichael Niedermayer2015-05-27
| | | | | | | | | | | | Fixes Ticket4301 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_hqdn3d: Initialize the whole LUTMichael Niedermayer2015-05-27
| | | | | | | | | | | | | | | | | | 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>
* | avcodec/nvenc: Fix typo: 1204 -> 1024Philip Langdale2015-05-26
| | | | | | | | | | | | Fixes Ticket4508 Signed-off-by: Philip Langdale <philipl@overt.org>
* | avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user sets ↵Michael Niedermayer2015-05-27
| | | | | | | | | | | | | | | | | | strict to -1 Fixes Ticket4267 Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: do not print misleading recommanditions on 1pass vpx encodingMichael Niedermayer2015-05-26
| | | | | | | | | | | | Fixes part of Ticket4295 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'cf1f3d837e1266034a487de5b575bd76426c6b10'Michael Niedermayer2015-05-26
|\| | | | | | | | | | | | | | | * commit 'cf1f3d837e1266034a487de5b575bd76426c6b10': doc: Fix spelling of 'Transmission' See: 9898bd9a82ad16f7ef2dcc26542827ff92255821 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Fix spelling of 'Transmission'Sebastian Ramacher2015-05-26
| | | | | | | | | | Signed-off-by: Sebastian Ramacher <sramacher@debian.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/matroskaenc: Avoid floats in default duration calculationMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ircamenc: Avoid floatsMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: Add av_q2intfloat()Michael Niedermayer2015-05-26
| | | | | | | | | | | | | | This function allows writing AVRationals as IEEE floats without the need of platform dependant float operations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Avoid floats & float rounding in tmcd nb_frames calculationMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Avoid float usage in duration calculationMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Avoid float in bitrate calculationMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: Fix HWACCEL_MAX for D3D11Michael Niedermayer2015-05-26
| | | | | | | | | | Found-by: philipl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: Fix HWACCEL_MAX for D3D11Michael Niedermayer2015-05-26
| | | | | | | | | | Found-by: philipl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dxva2_h264: Fix "may be used uninitialized" warningsMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vdpau: Re-factor pre-hwaccel helper functions into separate headerPhilip Langdale2015-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avcodec/dxva2: Fix "may be used uninitialized" warningsMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Check if ID3D11VideoDecoder exists, not just the header to enable ↵Michael Niedermayer2015-05-26
| | | | | | | | | | | | | | | | | | d3d11va Fixes build with "mingw-w64-x86-64-dev 3.2.0-2" Tested-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/x86/vf_fspp: Fix invalid combination of opcode and operandsMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/dnxhd: Autodetect more files that can be decoded.Carl Eugen Hoyos2015-05-26
| |
* | mov: reject zero bytes_per_frame with non-zero samples_per_frameAndreas Cadhalpun2015-05-26
| | | | | | | | | | | | | | 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>
* | configure: d3d11va is auto-detected like the othersMichael Niedermayer2015-05-25
| | | | | | | | | | | | Fix the help text accordingly Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/riff: Add 0x729A as TwoCC for G.729.Carl Eugen Hoyos2015-05-25
| | | | | | | | Reported by forum user muchuan.
* | avcodec/dxva2: Fix build without D3D11Michael Niedermayer2015-05-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'Michael Niedermayer2015-05-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * D3D11va: add a Direct3D11 video decoder similar to DXVA2Steve Lhomme2015-05-25
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Improve upon dynamic arrays- movtext subtitlesNiklesh2015-05-25
| | | | | | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* | libshine: fix support for shine 3.0Andreas Cadhalpun2015-05-25
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avcodec/mjpegenc_common: Use ff_mpv_reallocate_putbitbuffer()Michael Niedermayer2015-05-25
| | | | | | | | | | | | | | Fixes assertion failure Fixes Ticket4396 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Factor ff_mpv_reallocate_putbitbuffer() outMichael Niedermayer2015-05-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmenc: Avoid floats in duration calculationMichael Niedermayer2015-05-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: Replace *0.7 by *7/10Michael Niedermayer2015-05-25
| | | | | | | | | | | | | | This avoids another float computation, avoiding a potential source of rounding issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: Do not use floats for vcd_padding_bitrateMichael Niedermayer2015-05-25
| | | | | | | | | | | | This reduces the risk for rounding differences. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: Set the video VBV parameters only for the video stream from -targetMichael Niedermayer2015-05-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/put_bits: Assert that size in set_put_bits_buffer_size() does not ↵Michael Niedermayer2015-05-25
| | | | | | | | | | | | cause integer overflows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>