summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* avformat/wtvdec: ignore mpeg2 extradataPeter Ross2014-05-011-13/+1
| | | | | | | | | | | | Files produced by windows media center contain meaningless mpeg1 sequence header. The mpeg2 decoder detects the presence mpeg1 sequence header start codes and attempts to decode the stream as mpeg1. (This problem introduced in 73a2d16b.) Fixes ticket #3601. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'Michael Niedermayer2014-05-011-2/+0
|\ | | | | | | | | | | | | * commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca': rmdec: do not export anything to AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: do not export anything to AVCodecContext.codec_nameAnton Khirnov2014-05-011-2/+0
| | | | | | | | | | That field will be deprecated and the value that is written there is not particularly useful.
* | Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'Michael Niedermayer2014-05-011-14/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d': asfenc: use codec descriptors instead of AVCodecs to write codec info Conflicts: tests/ref/lavf/asf tests/ref/seek/lavf-asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfenc: use codec descriptors instead of AVCodecs to write codec infoAnton Khirnov2014-05-011-14/+18
| | | | | | | | | | | | | | | | Also, stop using AVCodecContext.codec_name as fallback, since it will be deprecated. Changes the result of the lavf-asf test (and its associated seektest), since 'msmpeg4v3' gets written instead of just 'msmpeg4'.
* | Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'Michael Niedermayer2014-05-011-1/+0
|\ \ | |/ | | | | | | | | | | * commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0': oggparseskeleton: do not use AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparseskeleton: do not use AVCodecContext.codec_nameAnton Khirnov2014-05-011-1/+0
| | | | | | | | That field is undocumented, of dubious use, and will be deprecated.
* | Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'Michael Niedermayer2014-05-011-3/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '18f2514c4037befd37b02e4d4f10c159edf3b26f': mov: export stsd Compressorname in metadata Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: export stsd Compressorname in metadataAnton Khirnov2014-05-011-3/+8
| | | | | | | | | | Stop using the undocumented to-be-deprecated AVCodecContext.codec_name field.
* | avformat/vobsub: use av_make_q().Clément Bœsch2014-05-011-1/+1
| |
* | avformat/vobsub: remove pointless FAIL macro.Clément Bœsch2014-05-011-4/+2
| |
* | Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'Michael Niedermayer2014-05-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '141fdc763c2841b572d29a2ad78513e8d5325870': matroska: add the Opus mapping Conflicts: libavformat/matroska.c See: 30549294ef0f796d48b1ffa482bd9315d4dbb83c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: add the Opus mappingAnton Khirnov2014-05-011-0/+1
| |
* | Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'Michael Niedermayer2014-05-012-6/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1': matroskaenc: write CodecDelay Conflicts: libavformat/matroskaenc.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv This is largely not merged as it causes assertion failures and av sync errors Further investigation of this is warranted if the changes are found to fix/improve something in relation to d92b1b1babe69268971863649c225e1747358a74 See: d92b1b1babe69268971863649c225e1747358a74 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: write CodecDelayAnton Khirnov2014-05-011-0/+13
| |
* | avformat/avidec: set average frame rate from headerMichael Niedermayer2014-05-011-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'Michael Niedermayer2014-05-011-4/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'eb3b5501e8b85bfea09d533314cb6920efc42639': matroskadec: read the CodecDelay element Conflicts: libavformat/matroska.h libavformat/matroskadec.c See: d6f86d74edfa6e1464ddc613726559269bf1dc7b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: read the CodecDelay elementAnton Khirnov2014-04-302-1/+10
| |
* | avformat/nut: support storing RFC 3389 comfort noiseMichael Niedermayer2014-05-011-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'Michael Niedermayer2014-04-301-15/+126
|\ \ | |/ | | | | | | | | | | * commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb': librtmp: Map native options to librtmp ones when possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * librtmp: Map native options to librtmp ones when possibleLuca Barbato2014-04-301-15/+126
| | | | | | | | | | | | Makes the two protocols nearly seamless. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'Michael Niedermayer2014-04-301-4/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '7266e24f176389d2e81bfc7c829934f7c8ae361c': hls: Sync the file number with the start sequence Conflicts: libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Sync the file number with the start sequenceLuca Barbato2014-04-301-4/+1
| |
* | Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'Michael Niedermayer2014-04-301-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5': hls: Factor the sequence computation Conflicts: libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Factor the sequence computationLuca Barbato2014-04-301-3/+3
| |
* | Merge commit 'c7603b3c243331057300337a61464e6ac4a605cb'Michael Niedermayer2014-04-301-3/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'c7603b3c243331057300337a61464e6ac4a605cb': hls: Print start_number as first sequence value Conflicts: libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Print start_number as first sequence valueLuca Barbato2014-04-301-3/+6
| | | | | | | | The option now behaves as expected.
* | Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'Michael Niedermayer2014-04-301-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818': segment: Report the current media sequence Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Report the current media sequenceLuca Barbato2014-04-301-0/+3
| | | | | | | | Useful for debugging mostly.
* | Merge commit '344f7b5a7e0d50573dec402dfe6228676f3889d9'Michael Niedermayer2014-04-301-0/+3
|\ \ | |/ | | | | | | | | | | * commit '344f7b5a7e0d50573dec402dfe6228676f3889d9': hls: Report the current media sequence Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Report the current media sequenceLuca Barbato2014-04-301-0/+3
| | | | | | | | Useful for debugging mostly.
* | ff_put_wav_header: add flag to force WAVEFORMATEXDaniel Verkamp2014-04-308-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e: riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs. This flag is used in the Matroska muxer (the cause of the original change) and in the ASF muxer, because the specifications for these formats indicate explicitly that WAVEFORMATEX should be used. Muxers for other formats will return to the original behavior of writing PCMWAVEFORMAT when writing a header for raw PCM. In particular, this causes raw PCM in WAV to generate the canonical 44-byte header expected by some tools. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/xwma: fix memleak of dpds_tableMichael Niedermayer2014-04-291-7/+14
| | | | | | | | | | Fixes CID1087092 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/xwma: improve error codesMichael Niedermayer2014-04-291-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/xwma: use NULL instead of 0 for pointersMichael Niedermayer2014-04-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-04-292-39/+169
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavfi/drawtext: allow to format pts as HH:MM:SS.mmm. lavf/concatdec: implement automatic conversions. lavf/concatdec: reindent after last commit. lavf/concatdec: always do stream matching. lavf/concatdec: check match_streams() return value. lavf/concatdec: use a structure for each stream. ffprobe: use the codec descriptor if no decoder was found. lavf/matroska: add "binary" pseudo-MIME type. lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types. lavc: add a mime_types field to codec descriptors. lavc: add AV_CODEC_ID_BIN_DATA. lavc: add codec descriptors for TTF and OTF. lavc: add codec descriptors for deprecated ids. lavc/codec_desc: add separation comment. tools/ffhash: implement base64 output. tools/ffhash: use av_hash_final_hex(). lavu/hash: add hash_final helpers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/concatdec: implement automatic conversions.Nicolas George2014-04-291-1/+84
| | |
| * | lavf/concatdec: reindent after last commit.Nicolas George2014-04-291-11/+10
| | |
| * | lavf/concatdec: always do stream matching.Nicolas George2014-04-291-31/+68
| | |
| * | lavf/concatdec: check match_streams() return value.Nicolas George2014-04-291-1/+4
| | |
| * | lavf/concatdec: use a structure for each stream.Nicolas George2014-04-291-12/+19
| | |
| * | lavf/matroska: add "binary" pseudo-MIME type.Nicolas George2014-04-291-0/+1
| | | | | | | | | | | | | | | Avoid long scan and "Could not find codec parameters for stream" error when an attachment has this type.
* | | avformat/img2_alias_pix: fix 2 unused variable warningsMichael Niedermayer2014-04-291-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'Michael Niedermayer2014-04-291-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a70a783f04919514efec7751d710b64d8975fd7': hls: Add an option to prepend a baseurl to the playlist entries Conflicts: doc/muxers.texi libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hls: Add an option to prepend a baseurl to the playlist entriesLuca Barbato2014-04-291-0/+4
| | | | | | | | | | | | | | | | | | Useful to generate playlists with absolute paths. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'Michael Niedermayer2014-04-291-5/+5
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | * commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f': segment: Add an option to prepend a string to the list entries Conflicts: doc/muxers.texi libavformat/segment.c See: 5e278c19c752d65fdc1da1ceb599b091f71a4b4b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add an option to prepend a string to the list entriesEnrique Arizón Benito2014-04-291-0/+5
| | | | | | | | | | | | Useful to generate lists with absolute urls. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * lavc: eliminate tb_unreliable()Anton Khirnov2014-04-281-19/+1
| | | | | | | | | | If framerate estimation is enabled, it makes sense to always apply it, instead of limiting it to a few specific cases.
* | avformat/utils: Set the average frame rate from the r_frame_rate if the ↵Michael Niedermayer2014-04-281-0/+9
| | | | | | | | | | | | | | | | stream appears to be cfr This permits the average fps to be set in more cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Ensure that average fps is probed if requested by the user ↵Michael Niedermayer2014-04-281-2/+3
| | | | | | | | | | | | even if tb_unreliable() is 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud