virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity
72,370 Commits 38 Branches 408 Tags
e89e23e1bc1be8caebf666ff11252a38dc651484
Commit Graph

72370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
b71dc29729 avcodec/h263: Remove unused argument of h263_get_motion_length() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-24 16:58:55 +02:00
Michael Niedermayer
39de31ccb6 avcodec/mpeg4video: Reorder operations to reduce accesses to err_recognition 
About 9 cpu cycle faster mpeg4_decode_mb()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-24 16:11:38 +02:00
Andreas Cadhalpun
b71528d896 mov: always check avio_read return value 
If avio_read fails, the buffer can contain uninitialized data.

This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-24 15:08:21 +02:00
Andreas Cadhalpun
8e77f8ab4a mov: fix two memleaks 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-24 15:08:21 +02:00
Andreas Cadhalpun
a5718863da mov: abort on EOF in ff_mov_read_chan 
Otherwise the loop can take a lot of time if num_descr is very large.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-24 15:07:52 +02:00
Michael Niedermayer
0c3b4efc76 avformat/movenc: Remove float use from rgb_to_yuv() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-24 13:32:53 +02:00
Michael Niedermayer
28134d6a0e avformat/swfenc: Remove another unneeded float computation 
fewer chances for rounding differences between platforms is better

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-24 13:32:53 +02:00
Michael Niedermayer
5d4ff4a31e avformat/swfenc: Remove unneeded floats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-24 03:59:26 +02:00
Michael Niedermayer
17264cd281 avformat/avienc: Avoid float usage 
reduces risk for rounding differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 23:42:51 +02:00
Michael Niedermayer
3bf57acb9c avformat/4xm: Change fps to AVRational 
This fixes the video timebase as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 22:36:02 +02:00
Michael Niedermayer
de0d3fe562 avcodec/y41pdec: Avoid using float for size test 
Floats are not bitexact

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 21:46:07 +02:00
James Almer
8952254ffe libwebp: simplify AVCodec.close functions 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-23 14:46:46 -03:00
James Almer
57d9788d1b configure: simplify libwebp checks 
The libwebpmux pkg-config file already has an explicit dependecy on libwebp >= 0.2.0.
Also remove the warning and silently disable the anim encoder when libwebpmux is not new enough.
This is more in line with other library components, like libvpx-vp9

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-23 14:18:54 -03:00
Andreas Cadhalpun
ed4932a694 nutdec: fix various memleaks on failure 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-23 17:42:35 +02:00
Michael Niedermayer
4ae15605f6 avcodec/dcadec: Search and decode frame in case it starts later in a packet 
This fixes decoding the first frame of some dts files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 16:37:16 +02:00
Rodger Combs
40a3e1e9c5 avformat/wavdec: Increase dts packet threshold to fix more misdetections 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 16:04:19 +02:00
Michael Niedermayer
9f5769437a avformat/wavdec: Increase probe_packets limit 
Fixes DTS detection of b2429e5ba9.dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 12:07:23 +02:00
Andreas Cadhalpun
0b79a389ba nutdec: always check the get_str return value 
If it fails, the buffers can be (partially) uninitialized.

This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-23 10:36:44 +02:00
James Almer
1096c46c55 libwebp: use a separate AVClass for each encoder 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-23 01:52:16 -03:00
James Almer
44ca8a6adb libwebpenc_common: add header guards 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-23 01:44:54 -03:00
James Almer
98be2d94ea libwebp: remove unneeded defines 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-23 01:29:23 -03:00
Urvang Joshi
02cf59f3a6 WebP encoder: use WebPAnimEncoder API when available. 
WebPAnimEncoder API is a combination of encoder (WebPEncoder) and muxer
(WebPMux). It performs several optimizations to make it more efficient
than the combination of WebPEncode() and native ffmpeg muxer.

When WebPAnimEncoder API is used:
- In the encoder layer: we use WebPAnimEncoderAdd() instead of
  WebPEncode().
- The muxer layer: works like a raw muxer.

On the other hand, when WebPAnimEncoder API isn't available, the old code is
used as it is:
- In the codec layer: WebPEncode is used to encode each frame
- In the muxer layer:  ffmpeg muxer is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 03:31:28 +02:00
Michael Niedermayer
ebb0ca3d70 avformat/nutdec: Check X in 2nd branch of index reading 
Prevents read of uninitialized variable

Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-23 00:23:05 +02:00
Michael Niedermayer
f275f9eaee Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6' 
* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
  mpegvideo: Rework various functions not to use MpegEncContext directly

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 22:39:47 +02:00
Michael Niedermayer
179527f34e Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2' 
* commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2':
  mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 21:17:34 +02:00
Michael Niedermayer
a25ee5f922 Merge commit 'd528045558825f01472e9bee873f60c98d661e53' 
* commit 'd528045558825f01472e9bee873f60c98d661e53':
  mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c

The memset is left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 21:15:32 +02:00
Michael Niedermayer
bc373595f2 Merge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc' 
* commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc':
  mpegvideo: Drop stream_codec_tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 20:49:16 +02:00
Michael Niedermayer
d5227ceff1 Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193' 
* commit '9c1db92ad372d4cd69e0490e691c56e4097cb193':
  mpegvideo: Drop err_recognition

Conflicts:
	libavcodec/h263dec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg4video.h
	libavcodec/mpeg4videodec.c
	libavcodec/msmpeg4dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 20:38:42 +02:00
Michael Niedermayer
d9b264bc73 Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42' 
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
  mpegvideo: Drop flags and flags2

Conflicts:
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/ratecontrol.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 20:24:41 +02:00
Niklesh
337aa17e61 avcodec/movtextdec: Add support for large boxes(>32 bit) 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-05-22 08:32:20 -07:00
Vittorio Giovara
4e17946f10 mpegvideo: Rework various functions not to use MpegEncContext directly 2015-05-22 15:34:39 +01:00
Vittorio Giovara
a3f4c930ac mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly 2015-05-22 15:34:39 +01:00
Vittorio Giovara
d528045558 mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly 
This skips setting the memory to 0 but allows for reuse on different
contextes. Oracle did not report any unsual activity because of it.
 2015-05-22 15:34:39 +01:00
Vittorio Giovara
6f54dc43ce mpegvideo: Drop stream_codec_tag 
The field is unused.
 2015-05-22 15:34:39 +01:00
Vittorio Giovara
9c1db92ad3 mpegvideo: Drop err_recognition 
It is just a duplicate of an AVCodecContext member so use it instead.
 2015-05-22 15:34:39 +01:00
Vittorio Giovara
848e86f74d mpegvideo: Drop flags and flags2 
They are just duplicates of AVCodecContext members so use those instead.
 2015-05-22 15:34:39 +01:00
Michael Niedermayer
3b176af001 avformat/mxfenc: Add color siting element 
Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com>
Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 15:30:31 +02:00
Michael Niedermayer
a45cf639e6 libavformat/mux: Add ff_choose_chroma_location() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 15:30:31 +02:00
Michael Niedermayer
d09321b68e avcodec/mpeg12dec: Fix chroma location 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 15:30:31 +02:00
Tim Nicholson
ebb08f3fe4 avutil/pixfmt: Clarify DV example comments for AVChromaLocation 
Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 12:08:32 +02:00
Michael Niedermayer
1617a89cf0 Merge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07' 
* commit '29216d7fd14d1cec16821867d17c90b5c49e8c07':
  tls: fix compilation when both gnutls and openssl are enabled

See: e91fbfd9cf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 11:54:16 +02:00
James Almer
29216d7fd1 tls: fix compilation when both gnutls and openssl are enabled 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-22 12:21:38 +03:00
James Almer
e91fbfd9cf tls: fix compilation when both gnutls and openssl are enabled 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-22 00:33:33 -03:00
Urvang Joshi
f99fed733d WebP encoder: extract out some methods into a separate helper library. 
This is the 2nd patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 03:16:59 +02:00
Michael Niedermayer
a0124b89e3 Merge commit '94599a6de3822b13c94096d764868128f388ba28' 
* commit '94599a6de3822b13c94096d764868128f388ba28':
  tls: Remove all the local polling loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 02:49:38 +02:00
Michael Niedermayer
9221e362fd Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e' 
* commit 'd13b124eaf452b267480074b2e6946538ed03a6e':
  tls: Remove the nonblocking code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 02:38:11 +02:00
Michael Niedermayer
162644c833 Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02' 
* commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02':
  tls: Use custom IO to read from the URLContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 02:28:27 +02:00
Urvang Joshi
6b56fcbd10 WebP muxer: support a packet containing animated WebP. 
This is the 1st patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-22 00:17:53 +02:00
Martin Storsjö
94599a6de3 tls: Remove all the local polling loops 
These aren't necessary any longer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-22 00:06:11 +03:00
Martin Storsjö
d13b124eaf tls: Remove the nonblocking code 
Since the underlying URLContext read functions are used,
they handle interruption, without having to handle it at
this level.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-05-22 00:05:01 +03:00