Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-25avformat/movenc: Check failure of allocation of ctts_entries and propagate errorMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25avformat/movenc: fix cleanup on insufficient reserved_moov_sizeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25avformat/matroskadec: Use av_malloc_array() for index_entriesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25avformat/matroskadec: Check av_mallocz() return valuesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-24Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'Michael Niedermayer
* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4': hlsproto: Properly close avio buffer in case of error Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23avformat/dv: check av_malloc() return codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23avformat/librtmp: Fix build with --disable-network --enable-librtmpMichael Niedermayer
Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23hlsproto: Properly close avio buffer in case of errorVittorio Giovara
Fix a memory leak. CC: libav-stable@libav.org Bug-Id: CID 717999
2015-01-23mov: Do not compute negative SAR valuesVittorio Giovara
This partially reverts cf70ba37ba74089a18295b29e77dead0a3222c9e, since it didn't take into account when rotation is 0, but there is another valid operation (eg. translation) in the matrix. Found-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23libavformat/mov.c: Handle timecode from tmcd atom in counter modeJon Morley
When the timecode value is in counter mode then it is important to use the timescale and frameduration to calculate the timecode fps. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23Merge commit '9108967513fcaff3d55514a7bca4c9fbba128c71'Michael Niedermayer
* commit '9108967513fcaff3d55514a7bca4c9fbba128c71': rtspdec: Consistently use rtsp_hd_out for writing Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23rtspdec: Consistently use rtsp_hd_out for writingMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-23avformat: allow .264 as extension for raw H.264 streamWerner Robitza
In addition to .h264, .264 is also commonly used by people to name raw H.264 streams. Enables automatic recognition of the h264 format for the .264 extension. Signed-off-by: Werner Robitza <werner.robitza@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22avformat/mov: Stricter sanity checks on the display_matrixMichael Niedermayer
Fixes "broken" tkhd Found-by: koda Tested-by: koda Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22avformat/flvenc: accept AVMEDIA_TYPE_SUBTITLE instead of DATA for subtitlesMichael Niedermayer
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'Michael Niedermayer
* commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d': dashenc: Use inttypes.h macros for format strings instead of %lld Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22avformat/dashenc: fix format string generationRodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22dashenc: Use inttypes.h macros for format strings instead of %lldMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-22dashenc: Fix format string generationRodger Combs
Previously this always used the "lld" format for all parameters, not only time parameters. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-22librtmp: Allow changing the socket send buffer sizeBrian Brice
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-21libavformat/img2dec: fix warning when !HAVE_GLOBChristophe Gisquet
Variables are unused in this case. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19smoothstreamingenc: Add a missing "goto fail"Michael Niedermayer
This goto wasn't necessary originally, but it should have been added when the write_manifest call was added in 8e276378. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-19libavformat/mxfdec.c: support demuxing opatom audio without indexMark Reid
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18avformat/rmdec: Check the return value of av_get_packet()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18avformat/nsvdec: Check the return value of av_get_packet()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18avformat/sbgdec: remove double ;;Clément Bœsch
2015-01-17avformat/asfdec: Check the av_get_packet() return valueMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17avformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" ↵Michael Niedermayer
warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17avformat/nsvdec: Check av_get_packet() return valueMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16Merge commit '3941df546276b190cc9362fd093e6721e8e52f50'Michael Niedermayer
* commit '3941df546276b190cc9362fd093e6721e8e52f50': aea: Return proper error code on invalid header Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16aea: Return proper error code on invalid headerNidhi Makhijani
2015-01-16avformat: Improve data streams/codec supportAnshul Maheshwari
This adds data codec/stream handling where previously there was only audio/video/subtitles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15avformat/id3v2: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15Merge commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e'Michael Niedermayer
* commit '024e5a2d5ff8a94adce48abb15ce2fb471f9d18e': rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15Merge commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9'Michael Niedermayer
* commit '54bc15d5ebfd07fd468743ba29f709ea19e840b9': id3v2: fix reading v2.2 attached pictures Conflicts: libavformat/id3v2.c See: 05c3c568dccd6c42fdf6eea891d08c71fe2ee772 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15Merge commit '932788be5af8dee062c77851b573ea47dd6d047a'Michael Niedermayer
* commit '932788be5af8dee062c77851b573ea47dd6d047a': id3v2: add names to the parameters of ID3v2EMFunc.read Conflicts: libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15avformat/id3v2: Fix incompatible pointer type warningsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15Merge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce'Michael Niedermayer
* commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce': id3v2: constify the 'tag' parameter to special metadata parsing callback Conflicts: libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packetsMartin Storsjö
This fixes sending chunked packets (packets larger than the output chunk size, which often can be e.g. 4096 bytes) with a timestamp delta (or absolute timstamp, if it's a timestamp step backwards, or the first packet of the stream) larger than 0xffffffff. The RTMP spec explicitly says (in section 5.3.1.3.) that packets of type 3 (continuation packets) should include this field, if the previous non-continuation packet had it included. The receiving code handles these packets correctly. Pointed out by Cheolho Park. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-15avformat/mov: Do not set aspect ratios that would contain zerosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15avformat/mov: rewrite aspect from matrix codeMichael Niedermayer
The original code was intended purely for rotation == 0 In cf70ba37ba74089a18295b29e77dead0a3222c9e the condition was changed to use it only for rotation != 0 which broke the cases for which it was intended to be used as well as breaking cases for which it was not intended to be used. This changes the code so it could work for the more general case and fixes the regressions If you have sample files that are not handled correctly please open tickets or mail me! Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15Merge commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e'Michael Niedermayer
* commit 'cf70ba37ba74089a18295b29e77dead0a3222c9e': mov: Check angle rather than full matrix when updating SAR Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14id3v2: fix reading v2.2 attached picturesAnton Khirnov
In v2.2, the picture type is not a zero-terminated string, but has a constant size of 3 bytes.
2015-01-14id3v2: add names to the parameters of ID3v2EMFunc.readAnton Khirnov
Some of them are not immediately obvious.
2015-01-14id3v2: constify the 'tag' parameter to special metadata parsing callbackAnton Khirnov
Those functions should not ever modify it.
2015-01-14mov: Check angle rather than full matrix when updating SARVittorio Giovara
When the display matrix is not the identity one, but the rotation angle is zero, there is no need to update the sample aspect ratio. Otherwise, it is possible to obtain negative values which interferes with transcoding in later stages. This kind of behaviour is reproducible on mov files with "major_brand: MSNV". CC: libav-stable@libav.org Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-01-14img2dec: correctly use the parsed value from -start_numberVittorio Giovara
Previously the image sequence was always starting from the minimum number rather than the requested one. CC: libav-stable@libav.org
2015-01-14mpegts: identify h264 mvc streamsHendrik Leppkes
This fixes missdetecting such streams as something else like AAC Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14avformat/smoothstreamingenc: Add missing "goto fail"Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14avformat/mpeg: Avoid dead assignmentMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>