summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/y41pdec: Avoid using float for size testMichael Niedermayer2015-05-23
| | | | | | Floats are not bitexact Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libwebp: simplify AVCodec.close functionsJames Almer2015-05-23
| | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* configure: simplify libwebp checksJames Almer2015-05-23
| | | | | | | | | 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>
* nutdec: fix various memleaks on failureAndreas Cadhalpun2015-05-23
| | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avcodec/dcadec: Search and decode frame in case it starts later in a packetMichael Niedermayer2015-05-23
| | | | | | This fixes decoding the first frame of some dts files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wavdec: Increase dts packet threshold to fix more misdetectionsRodger Combs2015-05-23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wavdec: Increase probe_packets limitMichael Niedermayer2015-05-23
| | | | | | Fixes DTS detection of b2429e5ba9.dts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutdec: always check the get_str return valueAndreas Cadhalpun2015-05-23
| | | | | | | | | | 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>
* libwebp: use a separate AVClass for each encoderJames Almer2015-05-23
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* libwebpenc_common: add header guardsJames Almer2015-05-23
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* libwebp: remove unneeded definesJames Almer2015-05-23
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* WebP encoder: use WebPAnimEncoder API when available.Urvang Joshi2015-05-23
| | | | | | | | | | | | | | | | | | 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>
* avformat/nutdec: Check X in 2nd branch of index readingMichael Niedermayer2015-05-23
| | | | | | | Prevents read of uninitialized variable Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'Michael Niedermayer2015-05-22
|\ | | | | | | | | | | | | | | | | | | * commit '4e17946f10d39eec6cc03fb249ae8147373141b6': mpegvideo: Rework various functions not to use MpegEncContext directly Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Rework various functions not to use MpegEncContext directlyVittorio Giovara2015-05-22
| |
* | Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | * commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2': mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directlyVittorio Giovara2015-05-22
| |
* | Merge commit 'd528045558825f01472e9bee873f60c98d661e53'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directlyVittorio Giovara2015-05-22
| | | | | | | | | | This skips setting the memory to 0 but allows for reuse on different contextes. Oracle did not report any unsual activity because of it.
* | Merge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | * commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc': mpegvideo: Drop stream_codec_tag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Drop stream_codec_tagVittorio Giovara2015-05-22
| | | | | | | | The field is unused.
* | Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: Drop err_recognitionVittorio Giovara2015-05-22
| | | | | | | | It is just a duplicate of an AVCodecContext member so use it instead.
* | Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: Drop flags and flags2Vittorio Giovara2015-05-22
| | | | | | | | They are just duplicates of AVCodecContext members so use those instead.
* | avcodec/movtextdec: Add support for large boxes(>32 bit)Niklesh2015-05-22
| | | | | | | | Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
* | avformat/mxfenc: Add color siting elementMichael Niedermayer2015-05-22
| | | | | | | | | | | | 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>
* | libavformat/mux: Add ff_choose_chroma_location()Michael Niedermayer2015-05-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: Fix chroma locationMichael Niedermayer2015-05-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: Clarify DV example comments for AVChromaLocationTim Nicholson2015-05-22
| | | | | | | | | | Signed-off-by: Tim Nicholson <tim.nicholson@bbc.co.uk> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '29216d7fd14d1cec16821867d17c90b5c49e8c07'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | | | * commit '29216d7fd14d1cec16821867d17c90b5c49e8c07': tls: fix compilation when both gnutls and openssl are enabled See: e91fbfd9cf17270d78c73add53fada4c217fdb5e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: fix compilation when both gnutls and openssl are enabledJames Almer2015-05-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | tls: fix compilation when both gnutls and openssl are enabledJames Almer2015-05-22
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | WebP encoder: extract out some methods into a separate helper library.Urvang Joshi2015-05-22
| | | | | | | | | | | | | | 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>
* | Merge commit '94599a6de3822b13c94096d764868128f388ba28'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | * commit '94599a6de3822b13c94096d764868128f388ba28': tls: Remove all the local polling loops Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Remove all the local polling loopsMartin Storsjö2015-05-22
| | | | | | | | | | | | These aren't necessary any longer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | * commit 'd13b124eaf452b267480074b2e6946538ed03a6e': tls: Remove the nonblocking code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Remove the nonblocking codeMartin Storsjö2015-05-22
| | | | | | | | | | | | | | | | 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>
* | Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'Michael Niedermayer2015-05-22
|\| | | | | | | | | | | | | * commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02': tls: Use custom IO to read from the URLContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Use custom IO to read from the URLContextMartin Storsjö2015-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids hijacking the fd, by reading using the normal URLContext functions instead. This allowing reading data that has been buffered in the underlying URLContext. This avoids using the libraries own send functions that can cause SIGPIPE. The fd is still used for polling the lowlevel socket, for waiting for retries. Signed-off-by: Martin Storsjö <martin@martin.st>
* | WebP muxer: support a packet containing animated WebP.Urvang Joshi2015-05-22
| | | | | | | | | | | | | | 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>
* | doc/ffmpeg: basic documentation for -copy/ignore_unknownMichael Niedermayer2015-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: check result of avio_seekZhang Rui2015-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Support copying unknown streamsMichael Niedermayer2015-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mips: loongson fix bugs in mathops optimization周晓勇2015-05-21
| | | | | | | | | | | | the incorrect UMULH, ff_sqrt, MAC64 and MLS64 to be optimized later, delete them just for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: s/luma sample positions/horizontal luma sample positions/Michael Niedermayer2015-05-21
| | | | | | | | | | | | Better to be explicit before someone thinks this could be the time axis ... Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: make luma sample positions even more explicit in the ↵Michael Niedermayer2015-05-21
| | | | | | | | | | | | AVChromaLocation ASCII art Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: Clarify mpeg example comments for AVChromaLocationMichael Niedermayer2015-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: clarify chroma location text further, as "first" is ambigousMichael Niedermayer2015-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixfmt: Clarify that the ASCII art describes the location of the ↵Michael Niedermayer2015-05-21
| | | | | | | | | | | | first chroma sample of AVChromaLocation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>