aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | matroskadec: remove H.264 special-case that disabled header parsing.Reimar Döffinger2012-02-201-1/+0
| | | | | | | | | | | | | | | | | | The parser was fixed so this workaround should no longer be necessary. This allows using stream-copy to fix files with keyframes incorrectly marked. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-201-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxy: remove reference to removed api examples: unbreak compilation ttadec: cosmetics: reindent sunrast: use RLE trigger macro inplace of the hard coded value. sunrastenc: set keyframe flag for the output packet. mpegvideo_enc: switch to encode2(). mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0 Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxy: remove reference to removed apiLuca Barbato2012-02-191-4/+3
| |
| * examples: unbreak compilationLuca Barbato2012-02-191-12/+5
| | | | | | | | Update api so it will compile again.
* | img2dec: add im32 extension, sunrast with 32bit depthPaul B Mahol2012-02-191-0/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-198-52/+122
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mov: Use defines for sample flags in fragments mov: Use defines for trun flags mov: Use defines for tfhd flags proresenc: force bitrate not to exceed given limit vc1parse: call vc1_init_common(). wma: don't return 0 on invalid packets. asf: prevent packet_size_left from going negative if hdrlen > pktlen. mjpegb: don't return 0 at the end of frame decoding. rtpdec: Identify incorrectly signalled H263 vp8dsp: split long line. aiff: don't skip block_align==0 check on COMM-after-SSND files. dpcm: ignore extra unpaired bytes in stereo streams. mp3on4: require a minimum framesize. mpc7: assign an error level + context to av_log() msg. huffyuv: error out on bit overrun. dct-test: Add the missing ff_ prefix to the altivec functions dct-test: Remove a stray declaration of a nonexistent function movenc: Write the unknown duration as 64 bit fields in ismv movenc: Write track durations with all bits set if duration is unknown Conflicts: libavcodec/dct-test.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Use defines for sample flags in fragmentsMartin Storsjö2012-02-183-3/+15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * mov: Use defines for trun flagsMartin Storsjö2012-02-183-19/+27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * mov: Use defines for tfhd flagsMartin Storsjö2012-02-183-17/+26
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * asf: prevent packet_size_left from going negative if hdrlen > pktlen.Ronald S. Bultje2012-02-181-0/+7
| | | | | | | | | | | | | | | | This prevents failed assertions further down in the packet processing where we require non-negative values for packet_size_left. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * rtpdec: Identify incorrectly signalled H263Martin Storsjö2012-02-183-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | H263 in RTP can be packetized in two formats (RFC 2190, RFC 2429/4629). The former normally uses the static payload type 34, while the latter normally uses dynamic payload types with the SDP format names H263-1998 or H263-2000. Look for packets that don't look like proper RFC 2190 packets and switch to depacketizing them according to the new format if they match some heuristic criteria. Signed-off-by: Martin Storsjö <martin@martin.st>
| * aiff: don't skip block_align==0 check on COMM-after-SSND files.Ronald S. Bultje2012-02-171-2/+2
| | | | | | | | | | | | | | This prevents SIGFPEs when using block_align for divisions. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * movenc: Write the unknown duration as 64 bit fields in ismvMartin Storsjö2012-02-181-0/+6
| | | | | | | | | | | | | | This is required for the files to play back properly in windows media player. Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Write track durations with all bits set if duration is unknownMartin Storsjö2012-02-181-2/+8
| | | | | | | | | | | | | | | | According to 14496-12, the duration should be all 1s if the duration is unknown. This is the case if writing a moov atom without any samples described in it (e.g. as in ismv files). Signed-off-by: Martin Storsjö <martin@martin.st>
* | oggenc: fix condition when not to flush due to keyframe granule.Reimar Döffinger2012-02-181-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | The previous condition of 0 page size was wrong, that would disable the mechanism for all frames at a start of a page, thus some keyframes still would not get their own granule. The real problem is that header packets must not be flushed, but they have (and must have) 0 granule and thus would be detected as keyframes. Add a separate parameter to mark header packets. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | oggdec: improve warning message.Reimar Döffinger2012-02-181-1/+2
| | | | | | | | | | | | | | Print whether it was a keyframe or a non-keyframe that was incorrectly marked as the other. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Allow other programs to open the same files on Windows.Reimar Döffinger2012-02-181-2/+3
| | | | | | | | | | | | | | | | In order to match Linux behaviour better our Windows-specific open() replacement should disable Windows default file locking. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Make AAC in Ogg (ogm) work.Reimar Döffinger2012-02-181-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | This needs the extradata to be extracted. The approach used is the one MPlayer uses, though it is unclear whether the 4 bytes extradata that are skipped should be skipped always or only for AAC. The AAC parser must be disabled, too, otherwise playback still does not work. Fixes trac issue #547. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | movenc: Dont crash on aspect=0/0.Michael Niedermayer2012-02-181-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: remove harmless duplicate code.Michael Niedermayer2012-02-181-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-183-16/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) als: prevent infinite loop in zero_remaining(). cook: prevent div-by-zero if channels is zero. pamenc: switch to encode2(). svq1enc: switch to encode2(). dvenc: switch to encode2(). dpxenc: switch to encode2(). pngenc: switch to encode2(). v210enc: switch to encode2(). xwdenc: switch to encode2(). ttadec: use branchless unsigned-to-signed unfolding avcodec: add a Sun Rasterfile encoder sunrast: Move common defines to a new header file. cdxl: fix video decoding for some files cdxl: fix audio for some samples apetag: add proper support for binary tags ttadec: remove dead code swscale: make access to filter data conditional on filter type. swscale: update context offsets after removal of AlpMmxFilter. prores: initialise encoder and decoder parts only when needed swscale: make monowhite/black RGB-independent. ... Conflicts: Changelog libavcodec/alsdec.c libavcodec/dpxenc.c libavcodec/golomb.h libavcodec/pamenc.c libavcodec/pngenc.c libavformat/img2.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add a Sun Rasterfile encoderAneesh Dogra2012-02-171-1/+2
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * cdxl: fix audio for some samplesPaul B Mahol2012-02-171-7/+11
| | | | | | | | | | | | | | There may be extra padding at and of chunk. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * apetag: add proper support for binary tagsPaul B Mahol2012-02-171-8/+27
| | | | | | | | | | | | | | export as attachment streams Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | matroskadec: introduce resync function.Reimar Döffinger2012-02-171-6/+46
| | | | | | | | | | | | | | | | This allows handling matroska files with errors. Fixes test4.mkv and test7.mkv from the official Matroska test suite. These are also trac issues #544 and #545. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | movenc: fix crashes if a stream is empty.Reimar Döffinger2012-02-171-1/+4
| | | | | | | | | | | | | | For some reason this always happens with -f ismv. See trac issue #996. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | movenc: leave st->codec->frame_size as is instead of forcing it to 1.Andrew Wason2012-02-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Muxing pcm audio in MOV using avcodec_encode_audio() was failing because avcodec_encode_audio() returns an incorrect packet size of 4 bytes. This can be reproduced by modifying the sample ffmpeg/doc/examples/muxing.c to encode PCM, see ML patch muxing-test.diff I git bisected and commit 89ddff92a385 is the one that broke this. In mov_write_header() if st->codec->frame_size <= 1 it sets it to 1. Then avcodec_encode_audio() sets frame->nb_samples = avctx->frame_size, and frame->nb_samples of 1 is used to compute a packet size of 4 bytes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-178-58/+124
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: shorten: Use separate pointers for the allocated memory for decoded samples. atrac3: Fix crash in tonal component decoding. ws_snd1: Fix wrong samples counts. movenc: Don't set a default sample duration when creating ismv rtp: Factorize the check for distinguishing RTCP packets from RTP golomb: avoid infinite loop on all-zero input (or end of buffer). bethsoftvid: synchronize video timestamps with audio sample rate bethsoftvid: add audio stream only after getting the first audio packet bethsoftvid: Set video packet duration instead of accumulating pts. bethsoftvid: set packet key frame flag for audio and I-frame video packets. bethsoftvid: fix read_packet() return codes. bethsoftvid: pass palette in side data instead of in a separate packet. sdp: Ignore RTCP packets when autodetecting RTP streams proresenc: initialise 'sign' variable mpegaudio: replace memcpy by SIMD code vc1: prevent using last_frame as a reference for I/P first frame. Conflicts: libavcodec/atrac3.c libavcodec/golomb.h libavcodec/shorten.c libavcodec/ws-snd1.c tests/ref/fate/bethsoft-vid Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Don't set a default sample duration when creating ismvMartin Storsjö2012-02-161-3/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtp: Factorize the check for distinguishing RTCP packets from RTPMartin Storsjö2012-02-166-5/+7
| | | | | | | | | | | | The binary doesn't change after this patch. Signed-off-by: Martin Storsjö <martin@martin.st>
| * bethsoftvid: synchronize video timestamps with audio sample rateJustin Ruggles2012-02-161-18/+29
| | | | | | | | | | | | | | | | According to unofficial documentation, the video rate is locked to the audio sample rate. This results in proper synchronization of audio and video timestamps from the demuxer. This only works if the first audio packet occurs before the first video packet or the audio sample rate is the default rate of 11111 Hz, both of which are true for all samples in our archive.
| * bethsoftvid: add audio stream only after getting the first audio packetJustin Ruggles2012-02-161-15/+27
| | | | | | | | | | | | This avoids initializing a stream with dummy values or when the file does not contain audio. Also set duration for audio packets, using the sample rate as the time base.
| * bethsoftvid: Set video packet duration instead of accumulating pts.Justin Ruggles2012-02-161-7/+5
| |
| * bethsoftvid: set packet key frame flag for audio and I-frame video packets.Justin Ruggles2012-02-161-0/+3
| | | | | | | | | | Fixes avconv video stream copy of bethsoft video, which was skipping all video frames unless the copyinkf option was used.
| * bethsoftvid: fix read_packet() return codes.Justin Ruggles2012-02-161-9/+22
| | | | | | | | Use proper AVERROR codes, and return 0 for no error.
| * bethsoftvid: pass palette in side data instead of in a separate packet.Justin Ruggles2012-02-161-6/+29
| | | | | | | | | | | | Update FATE reference to account for now non-existent palette packet. This also fixes the FATE test if frame data is not initialized in get_buffer(), so update comment in avconv accordingly.
| * sdp: Ignore RTCP packets when autodetecting RTP streamsMartin Storsjö2012-02-161-0/+3
| | | | | | | | | | | | | | | | The rtp demuxer which listens for RTP packets and detects the RTP payload type will currently get confused if the first packet received is an RTCP packet. Thus ignore such packets. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1629-42/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Add an ff_ prefix to some lavf internal symbolsMartin Storsjö2012-02-1528-42/+42
| | | | | | | | | | | | | | | | | | | | Prefix the functions/tables brktimegm, pcm_read_seek, dv_offset_reset, voc_get_packet, codec_movaudio_tags, codec_movvideo_tags. After this, lavf has no global symbols without the proper prefix. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Make rtsp_demuxer_class staticMartin Storsjö2012-02-151-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1514-64/+643
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) CDXL demuxer and decoder hls: Re-add legacy applehttp name to preserve interface compatibility. hlsproto: Rename the functions and context hlsproto: Encourage users to try the hls demuxer instead of the proto doc: Move the hls protocol section into the right place libavformat: Rename the applehttp protocol to hls hls: Rename the functions and context libavformat: Rename the applehttp demuxer to hls rtpdec: Support H263 in RFC 2190 format rv30: check block type validity ttadec: CRC checking movenc: Support muxing VC1 avconv: Don't split out inline sequence headers when stream copying VC1 rv34: handle size changes during frame multithreading rv40: prevent undefined signed overflow in rv40_loop_filter() rv34: use AVERROR return values in ff_rv34_decode_frame() rv34: use uint16_t for RV34DecContext.deblock_coefs librtmp: Add "lib" prefix to librtmp URLProtocol declarations. movenc: Use defines instead of hardcoded numbers for RTCP types smjpegdec: implement seeking ... Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/rv30.c libavcodec/tta.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * CDXL demuxer and decoderPaul B Mahol2012-02-144-1/+173
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * hls: Re-add legacy applehttp name to preserve interface compatibility.Alex Converse2012-02-141-1/+1
| |
| * hlsproto: Rename the functions and contextMartin Storsjö2012-02-141-20/+20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * hlsproto: Encourage users to try the hls demuxer instead of the protoMartin Storsjö2012-02-141-0/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Rename the applehttp protocol to hlsMartin Storsjö2012-02-144-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the old protocol name around for backwards compatibility until the next bump. Deprecate the method of implicitly assuming the nested protocol. For applehttp://server/path, it might have felt logical, but supporting hls://server/path isn't quite as intuitive. Therefore only support hls+http://server/path from now on. Using this protocol at all is discouraged, since the hls demuxer is more complete and fits into the architecture better. There have been cases where the protocol implementation worked better than the demuxer, but this should no longer be the case. Signed-off-by: Martin Storsjö <martin@martin.st>
| * hls: Rename the functions and contextMartin Storsjö2012-02-141-22/+22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Rename the applehttp demuxer to hlsMartin Storsjö2012-02-143-4/+4
| | | | | | | | | | | | | | | | When this demuxer was created, there didn't seem to be any consensus of a common short name for this protocol. Now the consensus seems to be to call it hls. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Support H263 in RFC 2190 formatMartin Storsjö2012-02-144-0/+187
| | | | | | | | | | | | | | | | | | This is different from the "modern" RTP payload formats for H263 as defined by RFC 4629, 2429 and 3555. According to the newer RFCs, this old one is to be considered deprecated and only be used for interoperating with legacy systems. Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Support muxing VC1Martin Storsjö2012-02-142-1/+175
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 01:02:30 +0000