virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
49,472 Commits 37 Branches 400 Tags 465 MiB
2b6a8187a6
Commit Graph

49472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
c4738c3196 ffmpeg: fix typo in open_files() message 
Found-By: Justin Ruggles
 2013-01-25 00:46:41 +01:00
Stefano Sabatini
1ec3324f00 lavf/img2enc: extend current options documentation 2013-01-25 00:04:23 +01:00
Stefano Sabatini
069d156454 lavf/img2dec: fix option help fields 2013-01-25 00:04:22 +01:00
Stefano Sabatini
2756c3091a doc/faq: fill missing word in the concat protocol entry 2013-01-25 00:04:22 +01:00
Stefano Sabatini
40cb682ca0 doc/faq: mention concat protocol documentation in the protocol concatenation entry 2013-01-25 00:04:22 +01:00
Michael Niedermayer
c10350358d gifdec: gif_copy_img_rect: Fix end pointer 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 23:11:44 +01:00
Michael Niedermayer
fc8e8e5bef h264_qpel: put cpuflags checks back. 
These where lost when libav moved the code out of dsputil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 22:14:39 +01:00
Michael Niedermayer
cf48b00640 cavsdec: check for value in get_ue_code() 
Fixes integer overflow and prints an error in case the value is
invalid.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 21:55:12 +01:00
Jason
77b740ac0a lavu/timecode: fix time code calculation for 60000/1001 drop frame 
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 21:06:24 +01:00
Jason
a717fa84ed lavu/timecode: Allow drop frame mode for 60000/1001 fps 
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 21:06:24 +01:00
Diego Biurrun
33552a5f7b arm: Add mathops.h to ARCH_HEADERS list 
It is an arch-specific header not suitable for standalone compilation.
 2013-01-24 20:59:22 +01:00
Luca Barbato
4333df6355 avstring: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-24 20:49:54 +01:00
Diego Biurrun
2c10e2a2f6 build: Make the H.264 parser select h264qpel 
It is required for building the shared H.264 code.
 2013-01-24 19:25:21 +01:00
Janne Grunau
c5c2060cf5 x86: h264qpel: add cpu flag checks for init function 
The code was copied from per cpu extension init function so the checks
for supported extensions was overlooked.
 2013-01-24 19:03:59 +01:00
Michael Niedermayer
55d66b2790 movenc: check that fps for tmcd is within encodable range. 
The fps is stored as a 8 bit value thus 255 is the maximum encodable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 18:59:49 +01:00
Michael Niedermayer
9362f31b55 movenc: Calculate fps for tmcd without intermediate step. 
Fixes part of Ticket2045

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 18:57:12 +01:00
Michael Niedermayer
bee044d7c2 ffmpeg: copy tmcd track timebase parameters 
Fixes part of Ticket2045

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 18:37:32 +01:00
Michael Niedermayer
b75ac7c71c lavc: include timebase in avcodec string at debug level. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 18:35:07 +01:00
Michael Niedermayer
c071b00643 mpeg12demux: Fallback to startcode for stream type identification. 
Fixes Ticket2147
Fixes SageTV support

Based-on patch by Andrew Gallatin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 17:10:23 +01:00
Janne Grunau
6bdb841b46 h264: copy h264qpel dsp context to slice thread copies 2013-01-24 17:06:52 +01:00
Janne Grunau
8e148b8742 arm: h264qpel: use neon h264 qpel functions only if supported 2013-01-24 17:06:52 +01:00
Paul B Mahol
eb567a7999 eacdata: do not set sample_fmt 
It is supposed to be set from lavc only.
Also this one differs from one set in decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 15:02:44 +00:00
Paul B Mahol
7b007a7c1f flic: do not set sample_fmt 
It is supposed to be set from lavc only.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 15:02:44 +00:00
Michael Niedermayer
fc13a89654 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dsputil: Separate h264 qpel

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 15:47:47 +01:00
Michael Niedermayer
70b0aeba00 Merge commit '7a95afe433b2a692f490b98948c082e62ffc1d27' 
* commit '7a95afe433b2a692f490b98948c082e62ffc1d27':
  doc: fix dependencies in pod generation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 14:35:15 +01:00
Michael Niedermayer
9c555bca68 Merge commit '528878ee7b377e23a194d7c801571d97793047e0' 
* commit '528878ee7b377e23a194d7c801571d97793047e0':
  openbsd: configure: Stop enabling PIC by default

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 14:29:29 +01:00
Michael Niedermayer
b4581e9394 Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5' 
* commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5':
  rtpenc_chain: Use the original AVFormatContext for getting payload type
  rtp: Make sure the output format pointer is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 14:18:30 +01:00
Michael Niedermayer
1d2abca7e1 wmv2enc: drop setting of idct_algo 
This should have become redundant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 14:15:55 +01:00
Michael Niedermayer
40c27504a5 Merge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c' 
* commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c':
  wmv2: Propagate the wmv2 idct permutation type to the dsputils context
  rtp: Make sure priv_data is set before reading it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 14:15:40 +01:00
Paul B Mahol
dd5689a3bd matroskadec: export codec bits_per_coded_sample 
Fixes -codec copy with TTA from matroska to matroska.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 12:15:12 +00:00
Paul B Mahol
ee8d4a4142 matroskaenc: fix -codec copy with TTA 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 11:59:43 +00:00
Paul B Mahol
9ddf5631e3 matroskaenc: support TTA muxing 
TTA in matroska does not store any private data.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 11:59:43 +00:00
Stefano Sabatini
c89a8ee23d doc/eval: fix/review the section about SI prefixes and usage 
In particular, prefer "prefix" to "postfix" as in the tool manuals, and
specify powers of 2 and 10 explicitly.

This is based on the commit:
commit 2bf794b698
Author: Marcus Stollsteimer <sto.mar@web.de>
Date:   Mon Nov 19 21:39:20 2012 +0100
 2013-01-24 12:26:21 +01:00
Stefano Sabatini
ca1bc188f4 doc/eval: fix documentation for time() function 2013-01-24 12:26:21 +01:00
Stefano Sabatini
2b207bab19 doc/eval: substitute if/then/else construct with an example making use of boolean expression composition 
Since the if/then/else construct is now supported natively, showing how
to compose such a construct from basic primitives is misleading.
 2013-01-24 12:19:02 +01:00
Stefano Sabatini
2ed0803c6c lavu/eval: extend if/ifnot functions to accept a third parameter 
Add support to an if/else construct, simplify logic in expressions.
 2013-01-24 12:19:01 +01:00
Paul B Mahol
056664ff25 lavc/tta: remove nonsense s->avctx indirection, use avctx directly 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 10:54:35 +00:00
Paul B Mahol
e65046bf83 lavfi/earwax: remove config_input() 
This is wrong function to check for input parameters.
Function is not needed because query_formats() already
sets supported sample rates.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-24 10:37:44 +00:00
Mans Rullgard
e9d817351b dsputil: Separate h264 qpel 
The sh4 optimizations are removed, because the code is
100% identical to the C code, so it is unlikely to
provide any real practical benefit.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-24 10:44:43 +01:00
Luca Barbato
7a95afe433 doc: fix dependencies in pod generation 
The script can and will change.
 2013-01-24 10:43:15 +01:00
Diego Biurrun
528878ee7b openbsd: configure: Stop enabling PIC by default 
Previously PIC was enabled as a magic workaround for binaries that
built fine, but failed to function at all.  This problem no longer
exists, possibly since the introduction of symbol versioning.
 2013-01-24 10:39:17 +01:00
Martin Storsjö
4a4a7e138c rtpenc_chain: Use the original AVFormatContext for getting payload type 
In ff_rtp_get_payload_type, the AVFormatContext is used for checking
whether the payload_type or rtpflags options are set. In rtpenc_chain,
the rtpctx struct is a newly initialized struct where no options have
been set yet, so no options can be fetched from there.

All muxers that internally chain rtp muxers have the "rtpflags" field
that allows passing such options on (which is how this worked before
8034130e06), so this works just as intended.

This makes it possible to produce H263 in RFC2190 format with chained
RTP muxers.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-24 11:31:36 +02:00
Martin Storsjö
932117171f rtp: Make sure the output format pointer is set 
Not sure if this actually happens, but we do the same check when
checking payload_type further above in the function, so it might
be needed.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-24 11:31:35 +02:00
Carl Eugen Hoyos
fc50175ba2 Refuse to mux tta into matroska, the output file is broken. 2013-01-24 10:23:00 +01:00
Michael Niedermayer
7e059c9c5d mpeg4videoenc: check w,h to be within the supported range. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 04:38:17 +01:00
Michael Niedermayer
46cb61819d gifdec: check that the last keyframe exists and has been successfully parsed. 
Prevents inconsistent state and null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 04:18:56 +01:00
Michael Niedermayer
b53ed19aa7 lcldec: Check length before unsigned subtraction. 
Fix integer overflow and out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 04:02:14 +01:00
Michael Niedermayer
69fb605ad5 mpc8: check stream count before accessing stream 1. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 02:51:51 +01:00
Michael Niedermayer
ee9151b616 ff_mss12_decode_init: check dimensions 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 01:47:20 +01:00
Carl Eugen Hoyos
df39c3ce38 matroskaenc: add codec_tag lists back. 
This reverts 312645e :
"Do not set codec_tag property for matroska muxers."

Also adds dummy codec_tag lists with codecs
supported in mkv but not in wav / avi.

Fixes ticket #2169.
 2013-01-24 01:22:07 +01:00