summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* lavf: add samba protocol via libsmbclientLukasz Marek2014-07-13
| | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* AVFormat: LRC demuxer and muxerStar Brilliant2014-07-13
| | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec: dvrms timestamps are pts not dtsMichael Niedermayer2014-07-13
| | | | | | Should fix Ticket3328 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: do not wait for packets from discarded streams for genptsMichael Niedermayer2014-07-13
| | | | | | | Fixes long loop Fixes Ticket3208 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mpegts: dont clear programs during probingMichael Niedermayer2014-07-12
| | | | | | Fixes Ticket 3763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/libssh: set freed pointers to NULLLukasz Marek2014-07-12
| | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/wavenc: use av_mallocz_array()Paul B Mahol2014-07-11
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/mpegts: skip updating programs/streams when determining durationMichael Niedermayer2014-07-11
| | | | | | Fixes Ticket2441 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'Michael Niedermayer2014-07-11
|\ | | | | | | | | | | | | | | | | | | * commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e': mov: Clarify tkhd flag settings Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Clarify tkhd flag settingsLuca Barbato2014-07-11
| |
* | Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'Michael Niedermayer2014-07-11
|\| | | | | | | | | | | | | | | | | | | * commit 'f90729699db9ede2bef2b28000f1795dab1b8996': mov: Do not group tracks if more than one is enabled per type Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Do not group tracks if more than one is enabled per typeLuca Barbato2014-07-11
| | | | | | | | The specification requires at most 1 track enabled per alternate group.
* | avformat/cdg: Do not fail if filesize cannot be determinedMichael Niedermayer2014-07-11
| | | | | | | | | | | | This fixes cdg with piped input which was broken by the previous commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'Michael Niedermayer2014-07-11
|\| | | | | | | | | | | | | * commit '44386aaad870cbd80ae0d08247ebc663476446ff': cdg: Forward error from avio_size() in read_header() function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdg: Forward error from avio_size() in read_header() functionNidhi Makhijani2014-07-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mpegts: pass MpegTSContext ptr explicitlyAlexander V. Lukyanov2014-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AVFormatContext->priv_data is not always a MpegTSContext, it can be RTSPState when decoding a RTP stream. So it is necessary to pass MpegTSContext pointer explicitly. Within libav, the write_section_data function doesn't actually use the MpegTSContext at all, so this doesn't change anything at the moment (no memory was corrupted before), but it reduces the risk of anybody trying to touch the MpegTSContext via AVFormatContext->priv_data in the future. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/hlsenc: correctly compute target durationNicolas Martyanoff2014-07-10
| | | | | | | | | | | | | | | | | | | | With HLS, the duration of all segments must be lower or equal to the target duration. Therefore floor(duration + 0.5) yields incorrect results. For example, for duration = 1.35, floor(duration + 0.5) yields 1.0, but the correct result is 2.0. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
* | Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit '0307cc2253e76772b1c645ac6117d08da87a147c': rtpdec: pass an AVFormatContext to ff_parse_fmtp() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: pass an AVFormatContext to ff_parse_fmtp()Anton Khirnov2014-07-09
| | | | | | | | Use it for logging, instead of NULL or the stream codec context.
* | Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | | | | | | | * commit '650d384048ed42579cc6d67bf32a94b468c0b6cb': yuv4mpegenc: do not access AVCodecContext.coded_frame Conflicts: libavformat/yuv4mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yuv4mpegenc: do not access AVCodecContext.coded_frameAnton Khirnov2014-07-09
| | | | | | | | | | | | | | | | Its contents are meaningful only if the stream codec context is the one actually used for encoding, which is often not the case (and is discouraged). Use AVCodecContext.field_order instead.
* | Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit '27c1f82f561932c83191bcd3e70e0cb1712485ba': nsvdec: remove commented out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nsvdec: remove commented out cruftAnton Khirnov2014-07-09
| |
* | Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f': mov: free the dv demux context with avformat_free_context() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: free the dv demux context with avformat_free_context()Anton Khirnov2014-07-09
| |
* | Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb': mtv: do not set sample_rate for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mtv: do not set sample_rate for videoAnton Khirnov2014-07-09
| |
* | Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | | | | | | | * commit 'b8604a976128ffbd316653cdec11ba487f1025bb': oggparsecelt: do not set AVCodecContext.frame_size Conflicts: libavformat/oggparsecelt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsecelt: do not set AVCodecContext.frame_sizeAnton Khirnov2014-07-09
| | | | | | | | It is supposed to be set by decoders only.
* | Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6': adxdec: get rid of an avpriv function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * adxdec: get rid of an avpriv functionAnton Khirnov2014-07-09
| | | | | | | | | | The only thing the demuxer needs is the sample rate to set the timebase, which can be simply read with AV_RB32.
* | Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1': lavc: export DV profile API used by muxer/demuxer as public Conflicts: configure doc/APIchanges libavcodec/Makefile libavcodec/dv_profile.c libavcodec/dv_profile.h libavcodec/version.h libavformat/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: export DV profile API used by muxer/demuxer as publicAnton Khirnov2014-07-09
| |
* | Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'c9c1265c52910578d3db1a6205c85b91ead0903f': avformat: update muxing doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: update muxing doxyAnton Khirnov2014-07-09
| | | | | | | | The callers should now set the stream timebase, not the codec one.
* | Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'Michael Niedermayer2014-07-09
|\| | | | | | | | | | | | | * commit 'abda15a990527557c20848f6ca2f82eb85e76dc9': cdg: set the keyframe flag on the first packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdg: set the keyframe flag on the first packetAnton Khirnov2014-07-09
| | | | | | | | Bug-Id: 55
* | avformat/m4vdec: raise threshold slightly for detectionMichael Niedermayer2014-07-09
| | | | | | | | | | | | Fixes Ticket3746 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: respect color_range when encoding dnxhd.Mark Boorer2014-07-09
| | | | | | | | | | | | Set the ACLR atom appropriately for legal / full range. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: remove gettimeofday() use, remove sys/time.hMichael Niedermayer2014-07-08
| | | | | | | | | | | | | | It causes portability issues, and would need ifdef hell if its kept Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)Alexander V. Lukyanov2014-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | AVFormatContext->priv_data is not always a MpegTSContext, it can be RTSPState when decoding a RTP stream. So it is necessary to pass MpegTSContext pointer explicitly. This fixes memory corruption from bug #3721 (RTSPState is smaller than MpegTSContext thus innocent memory gets overwritten). Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'Michael Niedermayer2014-07-08
|\| | | | | | | | | | | | | | | | | | | * commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294': mov: Remove a variable that is set but never used Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Remove a variable that is set but never usedMartin Storsjö2014-07-08
| | | | | | | | | | | | This silences a warning with gcc. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'Michael Niedermayer2014-07-08
|\| | | | | | | | | | | | | | | | | | | | | * commit '52a1c32c0a86e84d43f977c5148e62975a0c6917': nut: Use nut->version in the version range check Conflicts: libavformat/nutdec.c Note, this bug did not affect ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Use nut->version in the version range checkLuca Barbato2014-07-08
| | | | | | | | | | It was wrongly left unchanged when the version field had been introduced. (c94e2e85cb6af8a570d8542a830556243bd32873)
| * avformat_new_stream: make the AVCodec parameter constRoman Savchenko2014-07-08
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * smoothstreamingenc: Fix a memory leak on errorsMichael Niedermayer2014-07-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * vc1test: Check malloc callNidhi Makhijani2014-07-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/nutdec: if all else fails try to lookup video tag in isomMichael Niedermayer2014-07-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: check that the video resolution is supportedMichael Niedermayer2014-07-08
| | | | | | | | | | | | Resolutions are stored as 16bit integers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>