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
55,205 Commits 37 Branches 400 Tags 464 MiB
82fdfe8e51
Commit Graph

55205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Biurrun
e4529df944 flvdec: K&R formatting cosmetics 2013-08-01 12:43:53 +02:00
Diego Biurrun
390b4d7088 flvdec: Fix = vs. == typo in sample rate check 2013-08-01 12:43:53 +02:00
Michael Niedermayer
cca229e75a Merge commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b' 
* commit 'c7e921a54ffe7feb9f695c82f0a0764ab8d0f62b':
  avopt: Check whether the object actually has got an AVClass

Conflicts:
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 12:30:30 +02:00
Michael Niedermayer
fcccb4c11d Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5' 
* commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5':
  rtpproto: Move rtpproto specific function declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 12:03:24 +02:00
Michael Niedermayer
d6b37de4d4 Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec' 
* commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec':
  rtpproto: Simplify the rtp_read function by looping over the fds

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:58:17 +02:00
Michael Niedermayer
b39f012dee Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6' 
* commit '7531588fffbca1f0afdcc06635999c00dfc16ca6':
  rtpproto: Remove a misplaced comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:53:54 +02:00
Michael Niedermayer
d2c613dd14 Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e' 
* commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e':
  rtpproto: Support nonblocking reads

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:47:42 +02:00
Michael Niedermayer
57b8ce414b Merge commit '2e814d0329aded98c811d0502839618f08642685' 
* commit '2e814d0329aded98c811d0502839618f08642685':
  rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:42:30 +02:00
Michael Niedermayer
0c8efe4891 Merge commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f' 
* commit '45dd1ae1b3c18331f3db2293a9135bc5851e553f':
  avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs

Conflicts:
	libavfilter/buffer.c
	libavfilter/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:36:54 +02:00
Michael Niedermayer
b326438139 avutil/tree: fix memleaks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:29:12 +02:00
Michael Niedermayer
161054f37b Merge commit 'c2e936de07d054bf476e60445b453bf6b4836820' 
* commit 'c2e936de07d054bf476e60445b453bf6b4836820':
  tree-test: Refactor and plug memory leaks

Conflicts:
	libavutil/tree.c

Most of this commit is not merged due to bugs in it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 11:29:03 +02:00
Martin Storsjö
fd8f91e3f4 rtsp: Simplify code for forming the remote peer url 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-01 12:11:17 +03:00
Michael Niedermayer
bc47d126bf Merge commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986' 
* commit 'a9b04b2c43f95cc17c2291f83c27a3119471d986':
  tree.h: K&R formatting and typo cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 10:41:06 +02:00
Vittorio Giovara
3c8bff0740 avframe: have av_frame_get_side_data take const AVFrame* 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-01 09:41:45 +02:00
Martin Storsjö
ee37d5811c rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url 
A separate rtcp port can already be set when opening the rtp
protocol normally, but when doing port setup as in RTSP (where
we first need to open the local ports and pass them to the peer,
and only then receive the remote peer port numbers), we didn't
check the same url parameter as in the normal open routine.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-01 10:26:17 +03:00
Martin Storsjö
1851e1d05d rtpproto: Check the size before reading buf[1] 
I doubt that anyone ever would try to send a 1 byte packet
via the RTP protocol, but check just in case - it shouldn't
crash at least.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-01 09:41:21 +03:00
Andrey Utkin
11ace70607 doc/protocols: Document file protocol options 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-01 04:08:14 +02:00
Paul B Mahol
69fe25cdca lclenc: remove unused code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:43 +00:00
Paul B Mahol
fe37551249 sunrastenc: do not set avctx->coded_frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:43 +00:00
Paul B Mahol
678431d3f2 jv: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Paul B Mahol
ff1c13b133 mss3: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Paul B Mahol
02fe531afe mss2: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Paul B Mahol
451b2ca1b4 indeo2: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Paul B Mahol
76e27b1d05 smacker: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-31 20:01:42 +00:00
Vittorio Giovara
7748dd41be avconv: add -n option to immediately exit when output files already exist 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-31 22:28:54 +03:00
Andrey Utkin
681ad3a5b6 Document new 'blocksize' option of 'pipe' protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 21:17:03 +02:00
Andrey Utkin
a8f171151f file: Add 'blocksize' option 
Interruptibility of file operations is strongly desirable in case of
slow storage access, e.g. mounted network share.
This commit introduces possibility to limit data quantity transferred by
'file' protocol at once. By default, old behaviour is preserved and data
is still tried to be transferred without block size limitation.

Note that file I/O operation still may block (or even freeze) inside of
single read(2) or write(2) operation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 21:16:54 +02:00
Martin Storsjö
b85dbe68e2 avconv: Call exit_program instead of exit in avconv_opt as well 
This seems to have been missed in 636ced8e1d.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-31 22:11:32 +03:00
Martin Storsjö
c7e921a54f avopt: Check whether the object actually has got an AVClass 
AVIOContext has got an av_class member that only gets set if
opening the context using avio_open2, but not if allocating a
custom IO context. A caller that wants to read AVOptions from
an AVIOContext (recursively using AV_OPT_SEARCH_CHILDREN) may
not know if the AVIOContext actually has got a class set or not.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-31 21:31:14 +03:00
Martin Storsjö
b7e6da988b rtpproto: Move rtpproto specific function declarations to a separate header 
Mixing these with the rtp depacketizer functions in rtpdec.h is
no good.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-31 21:12:34 +03:00
Martin Storsjö
892b0be1df rtpproto: Simplify the rtp_read function by looping over the fds 
This avoids having duplicate code where only the fd parameter
differs.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-31 21:12:34 +03:00
Martin Storsjö
7531588fff rtpproto: Remove a misplaced comment 
The fdset is a pollfd array nowadays, and it is already populated
at this point.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-31 21:12:34 +03:00
Martin Storsjö
54e03ff6af rtpproto: Support nonblocking reads 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-31 21:12:34 +03:00
Martin Storsjö
2e814d0329 rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-31 21:12:34 +03:00
Diego Biurrun
45dd1ae1b3 avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs 2013-07-31 19:23:00 +02:00
Diego Biurrun
c2e936de07 tree-test: Refactor and plug memory leaks 
With the most annoying memory leak found by Derek Buitenhuis.
 2013-07-31 18:14:08 +02:00
Diego Biurrun
a9b04b2c43 tree.h: K&R formatting and typo cosmetics 2013-07-31 18:14:08 +02:00
Timothy Gu
3b3c1ed076 libxvid: Add SSIM displaying through a libxvidcore plugin 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 12:41:27 +02:00
Timothy Gu
ccb212b6c3 libxvid: add working lumimasking and variance AQ 
The old implementation is unusable due to change in the Xvid API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 11:57:52 +02:00
Michael Niedermayer
95960027a5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hls: Call avformat_find_stream_info() on the chained demuxers

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 11:01:30 +02:00
Romain Beauxis
38536e5927 Support for shine 3.0.0 2013-07-30 21:12:34 +00:00
Paul B Mahol
d49252721a lavf/webvttenc: use proper printf format for int64_t values 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-30 20:32:26 +00:00
Michael Niedermayer
1bbf94d84f avfilter/af_compand: %f is for printing doubles 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 22:24:42 +02:00
Michael Niedermayer
121fc05b4d avcodec/get_bits: place volatile at the right spot 
Should fix Ticket2825

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 20:55:54 +02:00
Michael Niedermayer
43411f416f avcodec/get_bits: init_state is used for thread sync, make it volatile 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 20:38:19 +02:00
Timothy Gu
6b255e5e70 doc/encoders: add libxvid doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-07-30 16:24:29 +02:00
Michael Niedermayer
d6686149e2 asfdec: Skip to keyframe after seeking 
Fixes Ticket1616

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 15:29:12 +02:00
Michael Niedermayer
66487d73c3 avdevice/timefilter: cleanup the formating of the test output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 12:35:53 +02:00
Michael Niedermayer
231e33f050 avutil/pixfmt: dont refer to deprecated PIX_FMT in the documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 12:32:05 +02:00
Michael Niedermayer
e5526a4bae avformat/gxfenc: replace deprecated PIX_FMT constants 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 12:29:20 +02:00