aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | udp: use pthread_cancel instead of a shared flag.Nicolas George2012-03-221-3/+11
| | | | | | | | | | It allows to exit the thread immediately instead of waiting for select to timeout (one second in the current code).
* | segment: fix null pointer dereferencePaul B Mahol2012-03-221-3/+5
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | electronicarts vp6: set duration of video streamPaul B Mahol2012-03-221-1/+5
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix type and codetype fields in the MMF header for some phones.Vidar Madsen2012-03-211-2/+2
| |
* | Print a warning when using wild guesses as time stamps.Reimar Döffinger2012-03-211-0/+5
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | westwood_vqa: set video stream durationPaul B Mahol2012-03-211-0/+2
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | westwood_vqa: fix SND0 chunk handlingPaul B Mahol2012-03-211-63/+71
| | | | | | | | | | | | | | | | Version from vqa header does not dictate which sound chunks may appear in file. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aiffdec: Fix SIGFPE on pcm_f32beTomas Härdin2012-03-211-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-2118-100/+296
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) avconv: free packet in write_frame() when discarding due to frame number limit FATE: use +/- flag option syntax for vp8 emu-edge tests lavf: make av_interleave_packet_per_dts() private. lavf: deprecate av_read_packet(). oggdec: output correct timestamps for Vorbis avconv: pass input stream timestamps to audio encoders lavc: shrink encoded audio packet size after encoding. xa: set correct bit rate xa: do not set bit_rate, block_align, or bits_per_coded_sample xa: fix end-of-file handling xa: fix timestamp calculation bink: fix typo in FFALIGN() argument bink: align plane width to 8 when calculating bundle sizes doc: pass -Idoc texi2html and texi2pod doc: texi2pod: add -I flag movenc: Add a min_frag_duration option rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers libavformat: Set the default for the max_delay option to -1 Generate manpages for AV{Format,Codec}Context AVOptions. doc/avconv: remove entries for AVOptions. ... Conflicts: doc/Makefile doc/ffmpeg.texi doc/muxers.texi ffmpeg.c libavcodec/Makefile libavcodec/options.c libavcodec/vp8.c libavformat/options.c tests/fate/demux.mak tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make av_interleave_packet_per_dts() private.Anton Khirnov2012-03-205-16/+39
| | | | | | | | | | There is no reason for it to be public, it's only meant to be used internally.
| * lavf: deprecate av_read_packet().Anton Khirnov2012-03-206-8/+34
| | | | | | | | | | | | The caller can achieve the same effect (i.e. getting raw unparsed/mangled packets) with av_read_frame() and AVFMT_FLAG_NOPARSE | AVFMT_FLAG_NOFILLIN
| * oggdec: output correct timestamps for VorbisJustin Ruggles2012-03-201-2/+81
| | | | | | | | | | | | | | | | | | Takes encoder delay into account by comparing first the coded page duration with the calculated page duration. Handles last packet duration if needed, also by comparing coded duration with calculated duration. Also does better handling of timestamp generation for packets in the first page for streamed ogg files where the start time is not necessarily zero.
| * xa: set correct bit rateJustin Ruggles2012-03-201-0/+3
| | | | | | | | Also fixes stream duration calculation.
| * xa: do not set bit_rate, block_align, or bits_per_coded_sampleJustin Ruggles2012-03-201-4/+3
| | | | | | | | The values in the header refer to decoded data, not compressed data.
| * xa: fix end-of-file handlingJustin Ruggles2012-03-201-2/+2
| | | | | | | | | | Do not output an extra packet when out_size is reached. Also return AVERROR_EOF instead of AVERROR(EIO).
| * xa: fix timestamp calculationJustin Ruggles2012-03-201-4/+2
| | | | | | | | The packet duration is always 28 samples.
| * movenc: Add a min_frag_duration optionMartin Storsjö2012-03-202-5/+11
| | | | | | | | | | | | | | | | The other fragmentation options (frag_duration, frag_size and frag_keyframe) are combined with OR, cutting fragments at the first of the conditions being fulfilled. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxersMartin Storsjö2012-03-201-2/+3
| | | | | | | | | | | | | | This enables reordering of UDP packets by default, unless the caller explicitly sets -max_delay 0. Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Set the default for the max_delay option to -1Martin Storsjö2012-03-205-2/+13
| | | | | | | | | | | | | | | | | | | | Make the muxers/demuxers that use the field handle the default -1 in the same way as 0. This allows distinguishing an intentionally set 0 from the default value where the user hasn't set it. Signed-off-by: Martin Storsjö <martin@martin.st>
| * Move AVFormatContext/AVCodecContext option tables to separate files.Anton Khirnov2012-03-202-39/+64
| | | | | | | | This will allow us to automatically generate manpages for them.
| * lavf: use AVStream.discard to disable queueing attached pictures.Anton Khirnov2012-03-201-1/+2
| |
| * lavf: requeue attached pictures after seeking.Anton Khirnov2012-03-201-10/+31
| | | | | | | | | | This allows the caller to get them without special code even after seeking before receiving any data.
| * id3v2: set the keyframe flag on attached pictures.Anton Khirnov2012-03-201-0/+1
| |
* | mxfdec: Only parse next partition pack if parsing forwardTomas Härdin2012-03-201-0/+3
| | | | | | | | | | | | This fixes ticket #1099. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flv: clarify use of video info/cmd frame.Clément Bœsch2012-03-202-4/+6
| | | | | | | | | | Also add generated key frame in the enum, and doxycomment the existing ones. Descriptions are directly taken from the public specifications.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-209-22/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) fix space type in Changelog ZeroCodec Decoder RealAudio Lossless decoder rtpenc: Use AVFormatContext.packet_size instead of a private option url: Document the expected behaviour of url_read libavformat: Use AVFormatContext.probesize in init_input docs: Fix a stray reference to tags in the generic doxy on dicts cosmetics: Align some AVInput/OutputFormat declarations zmbv: check decompress result zmbv: correct indentation adpcm: convert adpcm_thp to bytestream2. adpcm: convert adpcm_yamaha to bytestream2. adpcm: convert adpcm_swf to bytestream2. adpcm: convert adpcm_sbpro to bytestream2. adpcm: convert adpcm_ct to bytestream2. adpcm: convert adpcm_ima_amv/smjpeg to bytestream2. adpcm: convert adpcm_ea_xas to bytestream2. adpcm: convert adpcm_ea_r1/2/3 to bytestream2. adpcm: convert ea_maxis_xa to bytestream2. adpcm: convert adpcm_ea to bytestream2. ... Conflicts: Changelog libavcodec/Makefile libavcodec/adpcm.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavcodec/zerocodec.c libavcodec/zmbv.c libavformat/riff.c libavformat/url.h tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ZeroCodec DecoderDerek Buitenhuis2012-03-191-0/+1
| | | | | | | | | | | | | | | | An obscure Japanese lossless video codec, originally intended for use with a remote desktop application. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * RealAudio Lossless decoderKostya Shishkov2012-03-192-0/+10
| |
| * rtpenc: Use AVFormatContext.packet_size instead of a private optionMartin Storsjö2012-03-192-10/+8
| | | | | | | | | | | | | | | | The private option has not been part of any release yet (and it is only of use in quite rare cases), so just remove it instead of keeping it with deprecation warnings. Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Document the expected behaviour of url_readNicolas George2012-03-191-0/+13
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Use AVFormatContext.probesize in init_inputMartin Storsjö2012-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This was forgotten in the transition from av_open_input_file to avformat_open_input, see 603b8bc2a1. This doesn't change anything for the default case where the option isn't set, since PROBE_BUF_MAX is 1048576 (which was used as max probe size earlier) while the default value for the probesize option is 5000000, which for the probe function is clipped to PROBE_BUF_MAX anyway. Signed-off-by: Martin Storsjö <martin@martin.st>
| * cosmetics: Align some AVInput/OutputFormat declarationsMartin Storsjö2012-03-193-9/+9
| | | | | | | | | | | | Also add missing trailing commas. Signed-off-by: Martin Storsjö <martin@martin.st>
| * oma: Fix out of array read.Michael Niedermayer2012-03-181-3/+6
| | | | | | | | | | | | | | | | | | | | | | Input: 01-Untitled-partial.oma ZZUF params: zzuf[s=7157,r=0.001] Fixes Bugzilla #106 Bug-found-by: darkshikari Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | mp3_probe: consider id3 tags to be low scoring mp3.Michael Niedermayer2012-03-191-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet functionMatthieu Bouron2012-03-191-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Tell users about supported audio samplerates in mmf.Carl Eugen Hoyos2012-03-191-1/+1
| |
* | ZeroCodec DecoderDerek Buitenhuis2012-03-191-0/+1
| | | | | | | | | | | | | | | | An obscure Japanese lossless video codec, originally intended for use with a remote desktop application. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-183-41/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: make compare() function compatible with POSIX bc Update Janne's email address. APIchanges: Replace Subversion revision numbers by Git hashes. bytestream: Eliminate one level of pointless macro indirection. xwd: convert to bytestream2. vqavideo: port to bytestream2 API Read preset files with suffix .avpreset prores: allow user to set fixed quantiser lavf: remove some disabled code. lavf: only set average frame rate for video. lavf: remove a pointless check. avcodec: add XBM encoder Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h libavcodec/vqavideo.c libavformat/img2enc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove some disabled code.Anton Khirnov2012-03-171-36/+0
| |
| * lavf: only set average frame rate for video.Anton Khirnov2012-03-171-4/+4
| |
| * lavf: remove a pointless check.Anton Khirnov2012-03-171-1/+1
| | | | | | | | Timebase is already checked in avpriv_set_pts_info().
| * avcodec: add XBM encoderPaul B Mahol2012-03-172-1/+2
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | mxfdec: Let pkt->pts = mxf->current_edit_unit if intra-onlyTomas Härdin2012-03-181-0/+10
| | | | | | | | | | | | | | We can't do this in general since we could be reading a file with B-frames while lacking an index. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: fix non-blocking and interrupt handling.Nicolas George2012-03-171-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | In non-blocking mode, lowest-level read protocols are supposed block only for a short amount of time to let retry_transfer_wrapper() check for interrupts. Also, checking the interrupt_callback in the receiving thread is wrong, as interrupt_callback is not guaranteed to be thread-safe and the job is already done by retry_transfer_wrapper(). The error code was also incorrect. Bug reported by Andrey Utkin.
* | url: document url_read exact behaviour.Nicolas George2012-03-171-0/+13
| |
* | matroskadec: Fix null pointer exception on corrupted input.Michael Niedermayer2012-03-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-161-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dxa: remove useless code lavf: don't select an attached picture as default stream for seeking. avconv: remove pointless checks. avconv: check for get_filtered_frame() failure. avconv: remove a pointless check. swscale: convert hscale() to use named arguments. x86inc: add *mp named argument support to DEFINE_ARGS. swscale: convert hscale to cpuflags(). Conflicts: ffmpeg.c libswscale/x86/scale.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: don't select an attached picture as default stream for seeking.Anton Khirnov2012-03-151-1/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-151-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: stricter reference limit enforcement. h264: increase reference poc list from 16 to 32. xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. snow: check reference frame indices. snow: reject unsupported chroma shifts. Add ffvhuff encoding and decoding regression test anm: convert to bytestream2 API bytestream: add more unchecked variants for bytestream2 API jvdec: unbreak video decoding jv demux: set video stream duration fate: add pam image regression test Conflicts: libavcodec/adpcm.c libavcodec/anm.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/snowdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jv demux: set video stream durationPaul B Mahol2012-03-141-0/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Janne Grunau <janne-libav@jannau.net>