virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
46,371 Commits 37 Branches 400 Tags 462 MiB
1c755f7667
Commit Graph

46371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Storsjö
48f01398ba rtpdec: Cosmetic cleanup 
Mainly clean up the RTP statistics code, plus a few other obviously
misindentend lines.

Remove some useless comments, de-doxygenize some comments,
add spacing around operators and fix a typo.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-28 20:50:01 +02:00
Michael Niedermayer
d41c019da0 fate/scalenorm: unbreak fate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 18:26:11 +01:00
Stefano Sabatini
74e81b4de1 tests: do not set bogus scale sws_flags option in the scalenorm test 
sws_flags is not a valid scale option, and thus is ignored.
 2012-10-28 17:20:50 +01:00
Michael Niedermayer
f472d01c25 frame_thread_encode: fix context memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 17:04:11 +01:00
Michael Niedermayer
991db63951 frame_thread_encoder: fix packet memleak 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 16:47:23 +01:00
Michael Niedermayer
d8246d475c vc1dec: mark by assert that the default path cannot occur 
Fixes CID703827, CID703828
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 16:11:14 +01:00
Paul B Mahol
07ed191b15 parse ID3v2 chapters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-28 15:10:28 +00:00
Carl Eugen Hoyos
3f44809415 Synchronize libmpcodecs: Support 16bit yuv in telecine filter. 
Fixes ticket 1782.
 2012-10-28 15:46:35 +01:00
Carl Eugen Hoyos
96fac764fa Add an additional AAC TwoCC. 
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
Originally committed to vlc by Jean-Baptiste.
 2012-10-28 14:50:11 +01:00
bbraun
d72aef4e92 movenc: add more metadata types 
Fixes Ticket1052

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 14:36:57 +01:00
Michael Niedermayer
ac090fa68c lavu: keep context size variables 
They are essential to be able to use the utils without av_malloc()
That is for example use with malloc(), memalign(), some other
private allocation function, on the stack or others.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 14:33:41 +01:00
Michael Niedermayer
c73fcc8de3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  yuv4mpeg: reject unsupported codecs
  nutenc: K&R formatting cosmetics
  assdec: fix qsort() callback signature
  configure: detect sparc64 automatically
  vp8: fix memset() crossing array boundary
  h264: fix invalid pointer arithmetic
  amrwbdec: fix invalid pointer arithmetic

Conflicts:
	libavformat/nutenc.c
	libavformat/yuv4mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 14:24:27 +01:00
Michael Niedermayer
8943ad4014 Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
  avio: fix pointer type mismatches in avio_enum_protocols()
  avserver: use socklen_t where appropriate
  udp: use socklen_t where appropriate
  network: use HAVE_THREADS instead of local hack
  af_channelmap: remove stray enum declaration
  buffersink: remove stray semicolon after function definition

Conflicts:
	libavformat/avio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 13:19:11 +01:00
Michael Niedermayer
f9f79cb0ec fate: make sure the global sws flags are set to be bitexact for scalenorm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 13:05:35 +01:00
Nicolas George
14f69a0516 fate: add a test for scale with variable input format. 2012-10-28 09:59:03 +01:00
Nicolas George
b0e2f4a757 lavfi/concat: implement unsafe mode. 2012-10-28 09:14:34 +01:00
Luca Barbato
424b1e7642 yuv4mpeg: reject unsupported codecs 
The muxer already rejects unsupported pixel formats, reject also
unsupported codecs to prevent dangerous misuses.
 2012-10-28 05:07:55 +01:00
Luca Barbato
fce4450dec nutenc: K&R formatting cosmetics 2012-10-28 05:07:55 +01:00
Michael Niedermayer
c4a36b6f70 lpc: check that lpc_type is valid in ff_lpc_calc_coefs 
Fixes CID700759
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 03:27:16 +01:00
Michael Niedermayer
8edf9b1fa4 sws: rgb has no range, avoid random results if the user tries to mess with it anyway. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 02:46:56 +02:00
Michael Niedermayer
d23e8f53ad swr: use 64bit index/len for x86_64 mix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 02:09:08 +02:00
Michael Niedermayer
2aecfd4f20 vf_showinfo: check return code of av_image_get_linesize() 
Fixes CID703716
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 00:40:28 +02:00
Michael Niedermayer
0f943ed3c8 swfenc: zero fifo after freeing 
Fixes CID602000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 23:03:07 +02:00
Michael Niedermayer
189fbcede8 tak_parser: check ff_combine_frame() return code 
Fixes CID733706
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 23:03:07 +02:00
Clément Bœsch
6078bd8024 lavf/showspectrum: fix unaligned rdft data. 2012-10-27 22:59:05 +02:00
Piotr Bandurski
2ef26b5e73 riff: support 0xa100 TwoCC 
fixes decoding of file "4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav" from ticket #1856
(0xa100 = Comverse Infosys Ltd. G723 1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 21:41:59 +02:00
Michael Niedermayer
6c8d259ab1 msmpeg4dec: fix init code to not fail when called from 2 threads at the same time. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 21:39:06 +02:00
Michael Niedermayer
f44be0da94 ff_h263_decode_init_vlc: fix order of operations to avoid failure with 2 threads 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 21:31:49 +02:00
Mans Rullgard
4cbae57cef assdec: fix qsort() callback signature 
This changes the event_cmp() function to the correct signature,
avoiding an ugly cast.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 18:26:28 +01:00
Mans Rullgard
4cd217c065 configure: detect sparc64 automatically 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 18:24:55 +01:00
Mans Rullgard
4471a24207 vp8: fix memset() crossing array boundary 
Indexing across array boundaries is not allowed by C99.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 17:02:46 +01:00
Mans Rullgard
c4cccc8d3f h264: fix invalid pointer arithmetic 
Subtracting a (positive) value from the address of an array violates
C99 section 6.5.6:

  If both the pointer operand and the result point to elements of the
  same array object, or one past the last element of the array object,
  the evaluation shall not produce an overflow; otherwise, the
  behavior is undefined.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 17:02:46 +01:00
Mans Rullgard
50be207759 amrwbdec: fix invalid pointer arithmetic 
Subtracting a (positive) value from the address of an array violates
C99 section 6.5.6:

  If both the pointer operand and the result point to elements of the
  same array object, or one past the last element of the array object,
  the evaluation shall not produce an overflow; otherwise, the
  behavior is undefined.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 17:02:45 +01:00
Reimar Döffinger
5f9cbad603 Port MPlayer fixes for coverity issues in libmpcodecs. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-10-27 17:52:41 +02:00
Michael Niedermayer
425c30ddae sws: loose the minimum dimension checks 
A few quick tests show no fundamental problem with such diemnsions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 16:54:31 +02:00
Michael Niedermayer
733f85b7ae sws: improve error messages 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 16:54:05 +02:00
Michael Niedermayer
7de2196029 sws: fix extreem downscaling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 16:29:24 +02:00
Michael Niedermayer
95760b33e7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: fix tests for 2-arg math functions
  doc: git-howto: Clarify comment about pushing series of commits
  ivi_common: Drop unused function parameter from decode_band()
  cook: Remove some silly Doxygen comments
  cook: Remove senseless maybe_reformat_buffer32() function
  cook: cosmetics: Better names for joint_decode() function parameters
  cook: cosmetics: Better name for ccpl COOKSubpacket member
  doxygen: Add av_alloc_size to list of predefined macros
  doxygen: Drop some pointless entries from PREDEFINED macros list
  h263: avoid memcpys over array bound in motion vector caching for obmc

Conflicts:
	configure
	doc/git-howto.texi
	libavcodec/cook.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 15:02:35 +02:00
Mans Rullgard
4521645b1a avio: fix pointer type mismatches in avio_enum_protocols() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:43:44 +01:00
Mans Rullgard
cc64ec570c avserver: use socklen_t where appropriate 
Various socket functions expect a pointer to socklen_t which is not
necessarily int.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:11:49 +01:00
Mans Rullgard
be2efe0c7b udp: use socklen_t where appropriate 
getsockname() takes a pointer to socklen_t which is not necessarily
int.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:11:46 +01:00
Mans Rullgard
9efbfe57e0 network: use HAVE_THREADS instead of local hack 
HAVE_THREADS is set in config.h if pthreads or w32threads is
available, which presumably the proper condition here.

Also fixes undefined behaviour in preprocessor directives.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:11:17 +01:00
Mans Rullgard
67a68dcec2 af_channelmap: remove stray enum declaration 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:06:43 +01:00
Mans Rullgard
6b776c61da buffersink: remove stray semicolon after function definition 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-10-27 13:06:27 +01:00
Xidorn Quan
c25e9292ba fix a compiling error with llvm-gcc 
Move some #include in vda.h down to prevent libavutil headers
from interfering with system headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 04:32:40 +02:00
Michael Niedermayer
1909dbf11d ffmpeg: use av_rescale_delta() for audio stream copy 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 04:01:31 +02:00
Michael Niedermayer
2bcbdd8456 lavu: add more doxy to av_rescale_delta 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 02:58:09 +02:00
Michael Bradshaw
c430cb49fd Update my email address 
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 02:06:21 +02:00
Michael Niedermayer
e823e73677 sws_getGaussianVec: check variance and quality 
Found-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 01:25:00 +02:00
Michael Niedermayer
fe573d1a9b sws_allocVec: check length validity 
Found-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-27 01:24:51 +02:00