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
64,637 Commits 37 Branches 400 Tags 464 MiB
1db641cbd2
Commit Graph

64637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
7125b6ca90 avformat/segment: remove gettimeofday() use, remove sys/time.h 
It causes portability issues, and would need ifdef hell if its kept

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 22:52:39 +02:00
James Almer
2375b09473 alpha/idctdsp: move idct init code out of dsputil 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 22:19:38 +02:00
Alexander V. Lukyanov
8635954335 avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721) 
AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.

This fixes memory corruption from bug #3721 (RTSPState is smaller than
MpegTSContext thus innocent memory gets overwritten).

Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 22:06:18 +02:00
Michael Niedermayer
fd3388d63d Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294' 
* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 21:53:09 +02:00
Michael Niedermayer
839688bc63 Merge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d' 
* commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d':
  avplay: Handle pixel aspect ratio properly

See: 32fdfdfbda
See: 99b01e458c
See: 825ec16da9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 21:52:06 +02:00
Michael Niedermayer
a26ecba075 Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917' 
* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
  nut: Use nut->version in the version range check

Conflicts:
	libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 21:18:36 +02:00
Michael Niedermayer
eee6ad38f9 avdevice/lavfi: add io.h, should fix msvc build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 20:29:59 +02:00
Michael Niedermayer
550bda741c avcodec/alpha/dsputil_alpha: fix build 
Disable moved functions to prevent build/test failure,
patch to update and re-enable them is welcome
volunteer to maintain the alpha code is welcome too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 20:15:31 +02:00
Martin Storsjö
18fb38fb9e mov: Remove a variable that is set but never used 
This silences a warning with gcc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-08 21:14:43 +03:00
Martin Storsjö
cf280ed004 avplay: Handle pixel aspect ratio properly 
This was broken (left half-implemented) in 354468fc12.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-08 21:14:43 +03:00
Luca Barbato
52a1c32c0a nut: Use nut->version in the version range check 
It was wrongly left unchanged when the version field had been
introduced. (c94e2e85cb)
 2014-07-08 19:04:09 +02:00
Michael Niedermayer
7cb8f7ded4 avcodec/proresenc_anatoliy: check against maximum dimensions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 18:03:11 +02:00
Michael Niedermayer
7c7441b37d avcodec/roqvideoenc: check dimensions against maximum 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 17:33:39 +02:00
Michael Niedermayer
fe4c76b3d0 avcodec/roqvideoenc: fix infinite lambda increasing loop 
The threshold was choosen so that no further size decrease happened with larger lambda
with the test video.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 17:09:56 +02:00
Michael Niedermayer
a981d1b6aa avformat/nutdec: if all else fails try to lookup video tag in isom 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 16:37:06 +02:00
Michael Niedermayer
5a4edf6f0d avformat/movenc: check that the video resolution is supported 
Resolutions are stored as 16bit integers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 16:17:44 +02:00
Michael Niedermayer
1f935c3d0b Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6' 
* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 14:44:12 +02:00
Michael Niedermayer
70b423e148 Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe' 
* commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe':
  avformat_new_stream: make the AVCodec parameter const

Conflicts:
	libavformat/utils.c

See: e12cfd044c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 14:29:47 +02:00
Michael Niedermayer
e1f729d977 Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b' 
* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a43b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 13:48:26 +02:00
Martin Storsjö
79fce1ec8a arm: Avoid using the 'setend' instruction on ARMv7 and newer 
This instruction is deprecated on ARMv8, and it is serializing on
some ARMv7 cores as well [1].

[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-08 12:09:09 +03:00
Roman Savchenko
3d90f27ad5 avformat_new_stream: make the AVCodec parameter const 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-08 08:24:27 +00:00
Andrew Kelley
d3cfd7aff8 af_compand: make sure request_frame always outputs at least one frame 
This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-08 07:54:00 +00:00
Michael Niedermayer
14e2406de7 Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3' 
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/asvenc.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 03:19:06 +02:00
Michael Niedermayer
5c7bf354dc avcodec/crystalhd: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:51:56 +02:00
Michael Niedermayer
0ffba9feb6 avutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:50:52 +02:00
Michael Niedermayer
576ced5530 avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:49:13 +02:00
Michael Niedermayer
0dbcecc8dc avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:48:51 +02:00
Timothy Gu
8e6a66b662 doc: add doxygen target tag 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:11:19 +02:00
Timothy Gu
cee98aadb1 doc: make doxygen program configurable 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:08:04 +02:00
Timothy Gu
865a761081 doc: add doxy-wrapper.sh to doc/doxygen/html dependencies 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:03:35 +02:00
Michael Niedermayer
307239bdb6 ffserver: add HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:56:53 +02:00
Michael Niedermayer
1574eedd0e tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:56:33 +02:00
Michael Niedermayer
39ea21713c avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:55:47 +02:00
Michael Niedermayer
0ebcf87803 protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches 
Should fix build failure on MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:54:30 +02:00
Timothy Gu
5b58692ed4 swresample: misc. doxy improvements 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:36:56 +02:00
Michael Niedermayer
9ccc7aeeea doc/Doxyfile: use 5 columns for alphabetical index 
This reverts a hunk from 671005558a
Reduces diff to what we use on the server
Suggested-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 00:43:18 +02:00
Michael Niedermayer
242b3c292a Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d' 
* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 23:16:59 +02:00
Michael Niedermayer
75be508f7c Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc' 
* commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc':
  smoothstreamingenc: Fix a memory leak on errors

See: a53c5d454e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 23:05:03 +02:00
Michael Niedermayer
154954c2ac avcodec/vmdvideo: remove unneeded include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:57:36 +02:00
Michael Niedermayer
b8d017adba avformat/segment: simplify localtime* use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:57:36 +02:00
Deti fliegl
8cda23f341 avformat/segment: Support cutting at clocktime 
Signed-off-by: Deti fliegl <fliegl@baycom.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:56:55 +02:00
Diego Biurrun
a9aee08d90 dsputil: Split off FDCT bits into their own context 2014-07-07 12:28:45 -07:00
Andrey Utkin
2229a6dfe6 avdevice/lavfi: allow non-mmappable files for graph_file 
Use av_bprint_fd_contents() instead of av_file_map()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 21:28:25 +02:00
Andrey Utkin
fcd1f6bc9d avutil/bprint: Add av_bprint_fd_contents() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 21:28:18 +02:00
Omer Osman
1e9a93bfca libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream 
For implicit signaling cases (as possible for Spectral Band Replication
and Parametric Stereo Tools), the decoder must decode the first frame to
correctly identify the stream configuration (as called from
avformat_find_stream_info). The mechanism for this is built-in and only
requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec
struct.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-07 22:09:15 +03:00
Michael Niedermayer
a863c97e99 smoothstreamingenc: Fix a memory leak on errors 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-07 22:08:42 +03:00
Michael Niedermayer
06dae71d47 Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503' 
* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
  vmd: Split audio and video decoder

Conflicts:
	libavcodec/vmdvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 18:06:39 +02:00
Nidhi Makhijani
246f869590 vmd: Split audio and video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-07 07:45:00 -07:00
Michael Niedermayer
5320b34b98 avcodec/cljrdec: remove unneeded include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 16:31:51 +02:00
Michael Niedermayer
3790801f9c Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b' 
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 16:17:27 +02:00