summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* segmenter: loose rindex()Michael Niedermayer2011-10-171-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.Clément Bœsch2011-10-174-19/+19
|
* segment: Fix typo in segment_basenameMichael Niedermayer2011-10-171-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* segment: replace strdup() by av_strdup()Michael Niedermayer2011-10-171-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'luzero/segment'Michael Niedermayer2011-10-173-0/+236
|\ | | | | | | | | | | | | | | | | | | | | * luzero/segment: segment: extend options segment: basic pattern support and playlist output segment: introduce segmented chain muxer output-example: extend duration ratecontrol: estimate twice the qscale values Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: extend optionsLuca Barbato2011-10-131-5/+10
| | | | | | | | let set an alternate path for the segment files.
| * segment: basic pattern support and playlist outputLuca Barbato2011-10-121-4/+13
| | | | | | | | Yet another option half implemented, more will follow...
| * segment: introduce segmented chain muxerLuca Barbato2011-10-123-0/+222
| | | | | | | | | | Initial test code, the filename isn't yet guessed and the file index isn't printed yet.
| * output-example: extend durationLuca Barbato2011-10-121-1/+1
| |
* | av_tempfile: Pass int log_offset, void *log_ctxMichael Niedermayer2011-10-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cache: add todo listMichael Niedermayer2011-10-161-0/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cache: Fallback to using the cache size for AVSEEK_SIZE if the underlaying ↵Michael Niedermayer2011-10-161-1/+8
| | | | | | | | | | | | protocol has nothing better. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | add cache protocolMichael Niedermayer2011-10-163-0/+132
| | | | | | | | | | | | This allows backward seeking on top of some non seekable streams. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding ASP variant from QNAP Systems.Carl Eugen Hoyos2011-10-161-0/+1
| | | | | | | | Fixes part of ticket #560.
* | asf: export all the DRM stuff, some of it are human readable strings.Michael Niedermayer2011-10-161-1/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asf: dont warn the user about digital sigantures, they should on their own ↵Michael Niedermayer2011-10-161-1/+1
| | | | | | | | | | | | not cause failure. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asf: export encryption information from asf.Michael Niedermayer2011-10-161-0/+2
| | | | | | | | | | | | This way user apps can choose to skip such content. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: prores: get correct size for coded V plane if alpha is present prores: do not set pixel format on codec init pthread: prevent updating AVCodecContext from itself in frame_thread_free pthread: copy coded frame dimensions in update_context_from_thread vp8: prevent read from uninitialized memory in decode_mvs vp8: force reallocation in update_thread_context after frame size change vp8: fix return value if update_dimensions fails matroskadec: fix out of bounds write adpcmdec: calculate actual number of output samples for each decoder. adpcmdec: check remaining buffer size before decoding next block in the ADPCM IMA WAV decoder. adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder. adpcmdec: remove unneeded buf_size==0 check. adpcmdec: remove unneeded zeroing of *data_size dnxhdenc: fixed signed multiplication overflow Conflicts: tests/ref/fate/prores-alpha tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | matroskadec: fix out of bounds writeRonald S. Bultje2011-10-151-1/+1
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | | bit: require at least 1 frame for probingMichael Niedermayer2011-10-161-0/+3
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | idf: Improve idf_probe() so it doesnt succeed on 0 byte inputMichael Niedermayer2011-10-161-1/+3
| | |
* | | Support H264 from QNAP Systems.Carl Eugen Hoyos2011-10-151-0/+1
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-143-16/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proresdsp: fix function prototypes. prores-idct: fix overflow in c code. fate: update prores-alpha ref after changing pix_fmt to yuv444p10le prores: add missing feature warning for alpha mov: 10l: Terminate string with 0 not '0' mov: Prevent illegal writes when chapter titles are very short. prores: add appropriate -fix_fmt parameter to FATE command riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER Conflicts: libavcodec/avcodec.h libavformat/mov.c tests/fate/prores.mak tests/ref/acodec/g726 tests/ref/fate/prores-alpha Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mov: 10l: Terminate string with 0 not '0'Alex Converse2011-10-141-1/+1
| | |
| * | mov: Prevent illegal writes when chapter titles are very short.Alex Converse2011-10-141-8/+15
| | |
| * | riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_headerJohn Brooks2011-10-142-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cbSize field should be included in all cases, even with PCM where its value is ignored. Fixes encoding PCM audio in Matroska for some players which insist on a full WAVEFORMATEX structure for A_MS/ACM audio. Since fate uses wav files for the audio test a larger number of tests has changed checksums or shifted positions due to the 2 byte longer wave header. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-146-98/+103
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) prores: add FATE tests id3v2: reduce the scope of some non-globally-used symbols/structures id3v2: cosmetics: move some declarations before the places they are used shorten: remove the flush function. shn: do not allow seeking in the raw shn demuxer. avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK. avformat: update AVInputFormat allowed flags avformat: don't unconditionally call ff_read_frame_flush() when trying to seek. truespeech: use sizeof() instead of hardcoded sizes truespeech: remove unneeded variable, 'consumed' truespeech: simplify truespeech_read_frame() by using get_bits() truespeech: decode directly to output buffer instead of a temp buffer truespeech: check to make sure channels == 1 truespeech: check for large enough output buffer rather than truncating output truespeech: remove unneeded zero-size packet check. mlpdec: return meaningful error codes instead of -1 mlpdec: remove unnecessary wrapper function mlpdec: only calculate output size once mlpdec: validate that the reported channel count matches the actual output channel count pcm: reduce pointer type casting ... Conflicts: libavformat/avformat.h libavformat/id3v2.c libavformat/id3v2.h libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | id3v2: reduce the scope of some non-globally-used symbols/structuresDiego Biurrun2011-10-132-18/+14
| | |
| * | id3v2: cosmetics: move some declarations before the places they are usedDiego Biurrun2011-10-131-65/+65
| | |
| * | shn: do not allow seeking in the raw shn demuxer.Justin Ruggles2011-10-131-1/+1
| | | | | | | | | | | | | | | | | | The demuxer does not read the seektable, a parser is not possible without a full decode, and no shorten decoder can handle random seeking because it needs side info from the seektable.
| * | avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.Justin Ruggles2011-10-133-2/+5
| | | | | | | | | | | | This will prevent seeking by bytes for formats that cannot handle this.
| * | avformat: update AVInputFormat allowed flagsJustin Ruggles2011-10-131-1/+3
| | |
| * | avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.Justin Ruggles2011-10-131-10/+14
| |/ | | | | | | | | This prevents flushing the packet buffer when the input format does not support seeking.
* | Improve PVA probe function.Reimar Döffinger2011-10-131-2/+15
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | libmodplug: remove mathematical constants now redundant.Nicolas George2011-10-131-5/+0
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723.1: use raw muxerMohamed Naufal2011-10-133-22/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-1330-145/+194
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*Anton Khirnov2011-10-1219-59/+59
| |
| * Remove all uses of deprecated AVOptions API.Anton Khirnov2011-10-123-12/+11
| |
| * AVOptions: add new API for enumerating children.Anton Khirnov2011-10-121-22/+29
| | | | | | | | | | | | | | | | | | This will allow the caller to enumerate child contexts in a generic way and since the API is recursive, it also allows for deeper nesting (e.g. AVFormatContext->AVIOContext->URLContext) This will also allow the new setting/reading API to transparently apply to children contexts.
| * flvenc: Write the right metadata entry countMartin Storsjö2011-10-121-3/+10
| | | | | | | | | | | | | | | | No application rely on this count being correct as far as I know, but if we write a nonzero count value, it might just as well be the right one. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Request that dynamic rate is disabledMartin Storsjö2011-10-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DSS enables this automatically if streaming VOD over TCP. If enabled, the server feeds packets faster than realtime, screwing up RTCP NTP based timestamps. Also, DSS doesn't indicate that this was indicated, if it was enabled automatically (although if it was requested to be enabled, a header saying that it was enabled is added, but this isn't added if it is enabled automatically), making it even harder to detect and work around properly without explicitly asking for it to be disabled(/enabled, if we were able to support it). Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Parse the x-Accept-Dynamic-Rate headerMartin Storsjö2011-10-122-0/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Add ff_ prefix to all nonstatic symbolsMartin Storsjö2011-10-124-37/+37
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Read the packet length for all RTCP packet typesJohn Brooks2011-10-121-7/+7
| | | | | | | | | | | | | | | | | | | | | | This allows skipping past unsupported RTCP packet types, as RFC 3550 section 6.1 mandates. Currently this only has any practical effect if a sender puts an unrecognized type before RTCP_BYE in a compounded packet, or (incorrectly) does not put RTCP_SR first. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec: Fix the minimum packet length for RTCP SR packetsJohn Brooks2011-10-121-1/+1
| | | | | | | | | | | | We actually read 20 bytes of these packets. Signed-off-by: Martin Storsjö <martin@martin.st>
| * flvdec: Don't export metadata entries that aren't proper metadataMartin Storsjö2011-10-121-0/+14
| | | | | | | | | | | | | | | | | | This avoids writing these entries doubly if transcoding from flv to flv, since the muxer blindly writes any and all metadata keys set, in addition to the fixed fields that the muxer always writes. Signed-off-by: Martin Storsjö <martin@martin.st>
| * flvdec: Split out setting of numeric fields from storing metadataMartin Storsjö2011-10-121-5/+9
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Correct buffer handling for RTCP packetsJohn Brooks2011-10-131-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous code could read 4 bytes past the end of the buffer on a RTCP_SR packet or offset a pointer by an unchecked external value (payload_len), though neither will reliably cause a crash or other misbehavior beyond garbage timestamps. Additionally, unknown RTCP packet types, even in compounded packets, are now ignored as per RFC 3550 section 6.1, page 22, though currently this only has any practical effect if a sender puts an unrecognized type before RTCP_BYE in a compounded packet, or (incorrectly) does not put RTCP_SR first. Signed-off-by: John Brooks <john.brooks@bluecherry.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-123-74/+86
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud