summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec_asf: Set the no_resync_search option for the chained asf demuxer asfdec: Add an option for not searching for the packet markers cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others cosmetics: Align codec declarations cosmetics: Convert mimic.c to utf-8 avconv: remove an unused function parameter. avconv: remove now pointless variables. avconv: drop support for building without libavfilter. nellymoserenc: fix crash due to memsetting the wrong area. libavformat: Only require first packet to be known for audio/video streams avplay: Don't try to scale timestamps if the tb isn't set Conflicts: Changelog configure ffmpeg.c libavcodec/aacenc.c libavcodec/bmpenc.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/ffv1.c libavcodec/flacenc.c libavcodec/fraps.c libavcodec/huffyuv.c libavcodec/libopenjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/pamenc.c libavcodec/pgssubdec.c libavcodec/pngenc.c libavcodec/qtrleenc.c libavcodec/rawdec.c libavcodec/sgienc.c libavcodec/tiffenc.c libavcodec/v210dec.c libavcodec/wmv2dec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_asf: Set the no_resync_search option for the chained asf demuxerMartin Storsjö2012-04-07
| | | | | | | | | | | | | | | | | | | | Searching for packet markers doesn't make sense for this use case, where packets are fed one at a time to the demuxer. This fixes playing back streams that have packets not starting with the 0x82, 0x00, 0x00 marker. Signed-off-by: Martin Storsjö <martin@martin.st>
| * asfdec: Add an option for not searching for the packet markersMartin Storsjö2012-04-07
| | | | | | | | | | | | Some streams don't contain these. Signed-off-by: Martin Storsjö <martin@martin.st>
| * libavformat: Only require first packet to be known for audio/video streamsJoakim Plate2012-04-06
| | | | | | | | | | | | | | | | It can take a long time before subtitles or data streams show up, so we shouldn't wait for those before assuming we have all info for streams. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Support detecting and demuxing EIA-608 subtitles in mov.Reimar Döffinger2012-04-07
| | | | | | | | | | | | | | | | | | | | | | | | The format is slightly proprietary. DVDs use a format of code byte (0x00, 0x01, 0xfe or 0xff), two data bytes MOV uses instead cdat/cdt2 atom, two data bytes Auto-detecting and supporting both in one decoder is trivial, so a single codec ID is used. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | mpegpsenc: fix user specified mux rateMichael Niedermayer2012-04-07
| | | | | | | | | | | | Fixes Ticket1175 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: Align muxer/demuxer declarations mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning avcodec: remove avcodec_guess_channel_layout() avutil: Add av_get_default_channel_layout() Conflicts: doc/APIchanges libavcodec/mpeg12.c libavformat/cdg.c libavformat/matroskaenc.c libavformat/mpegts.c libavformat/nuv.c libavformat/wav.c libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Align muxer/demuxer declarationsMartin Storsjö2012-04-06
| | | | | | | | | | | | | | Also add missing trailing commas, break long codec_tag lines and add spaces in codec_tag declarations. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavc: add a OpenEXR decoderJimmy Christensen2012-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movdec: handle 0x7fff langcode as macintosh per the specsBaptiste Coudurier2012-04-06
| | | | | | | | | | | | | | | | The correct point that seperates ISO and MAC language codes is 0x400 according to the current QT spec. Old QT specs did not list where this seperation is but apparently only defined the meaning of the first 137. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support yuva444p rawvideo in nut.Carl Eugen Hoyos2012-04-06
| | | | | | | | Fixes ticket #1058.
* | mov: do not print string len in handler_name.Clément Bœsch2012-04-05
| | | | | | | | | | | | | | | | | | | | | | The handler name is stored as a pascal string in the QT specs (first byte is the length of the string), thus leading to an invalid metadata string export. Also add a second length check based on the first character to avoid overwriting an already specified handler_name (it happens with Youtube videos for instance, the handler_name get masked), or specifying an empty string metadata.
* | lavf: Fix the last PTS to be generated using -fflags +genptsThierry Foucu2012-04-05
| | | | | | | | | | | | | | | | | | | | | | | | To reproduce the problem, using ffprobe: ./ffprobe -show_packets -print_format compact -fflags +genpts -i fate_samples/mxf/C0023S01.mxf You will notice that the last video frame does not have it's PTS being set, even with using genpts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: properly write index informationRamiro Polla2012-04-05
| | | | | | | | | | | | | | The index must take into account the pre-roll time and must seek backwards, not forwards. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: start at object 1 instead of 0Ramiro Polla2012-04-05
| | | | | | | | | | | | This is how it is done in the official muxer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: remove useless castsRamiro Polla2012-04-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: reduce code duplication with new variableRamiro Polla2012-04-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: rename some variablesRamiro Polla2012-04-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: realloc index_ptr fewer timesRamiro Polla2012-04-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: w32threads: Make pthread_cond_wait follow POSIX cosmetics: Consistently place static, inline and av_cold attributes/keywords. sbrdsp: Use standard multiple inclusion guards. pcm: K&R formatting cosmetics rawdec: Support fourccs YV16 and YV24 rtmp: implement bandwidth notification rtmp: update supported audio codecs value Conflicts: libavcodec/pcm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: implement bandwidth notificationRaffaele Sena2012-04-03
| | | | | | | | | | | | Improve compatibility with some servers. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * rtmp: update supported audio codecs valueSamuel Pitoiset2012-04-03
| | | | | | | | | | | | | | | | The audio codecs property is composed by all values except SUPPORT_SND_INTEL (0x0008) and SUPPORT_SND_UNUSED (0x0010) which are unused. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Add AVIO_FLAG_DIRECT.Reimar Döffinger2012-04-04
| | | | | | | | | | | | | | | | Allows avoiding the buffer when using avio read, write and seek functions. When using the ffmpeg executable -avioflags direct can be used to enable this mode for input files, but has no effect on output files. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavf: add mp1/2 to determinable_frame_size()Michael Niedermayer2012-04-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Fix regression on files from Pinnacle ThunderTomas Härdin2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for this is that such files have IndexTableSegments which when parsed cover EditUnit ranges like this: [0,1) [249,250) [249,377) [0,249) where each interval is [IndexStartPosition,IndexStartPosition+IndexDuration). This would be reduced to a sparse index like: [0,1), [249,250) instead of the full range: [0,249), [249,377) See TimeCode_HD.mxf, UMID = 060a2b340101010101010410130000000004001aa0e59175025b2a5600da4101. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: print some more things in TS debug statementsMichael Niedermayer2012-04-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: increase RELATIVE_TS_BASEMichael Niedermayer2012-04-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swfdec: support compressed swf.Clément Bœsch2012-04-03
| |
* | mxfenc: Don't allow muxing audio-only since it's not supportedTomas Härdin2012-04-03
| | | | | | | | | | | | This fixes muxing audio-only output resulting in SIGFPE due to lack of EditRate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asf: remove duplicated index_guidMichael Niedermayer2012-04-03
| | | | | | | | | | Found-by:ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: fix a unused function warningMichael Niedermayer2012-04-02
| | | | | | | | | | | | note the function is used under #if Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: fix segfault with chapter tracksMichael Niedermayer2012-04-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vsrc_buffer: allow buffering arbitrary number of frames. vf_scale: avoid a pointless memcpy in no-op conversion. avfiltergraph: try to reduce format conversions in filters. avfiltergraph: add an AVClass to AVFilterGraph on next major bump. id3v2: fix skipping extended header in id3v2.4 Conflicts: libavfilter/vf_scale.c libavfilter/vsrc_buffer.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: fix skipping extended header in id3v2.4Anton Khirnov2012-04-01
| | | | | | | | In v2.4, the length includes the length field itself.
* | audiointerleave: check timebaseMichael Niedermayer2012-04-01
| | | | | | | | | | | | Replaces FPE by clean error Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: better NI detection.Michael Niedermayer2012-04-01
| | | | | | | | | | | | The new code detects NI avis by analyzing the index. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: apedec: check bits <= 32. cavs: Remove unused code. oggenc: fix condition when not to flush due to keyframe granule. oggenc: add pagesize option to set preferred page size libspeexdec: set frame size in libspeex_decode_init() smacker audio: sign-extend the initial 16-bit predicted value Conflicts: libavcodec/apedec.c libavcodec/libspeexdec.c libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggenc: fix condition when not to flush due to keyframe granule.Reimar Döffinger2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * oggenc: add pagesize option to set preferred page sizeAndres Gonzalez2012-03-30
| | | | | | | | | | | | | | | | When set, if an Ogg stream buffer has enough data, a page is made instead of filling maximum-size pages. Using smaller pages results smaller seek intervals at the expense of higher container overhead. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | lxfdec: support version 1 files, too.Reimar Döffinger2012-03-31
| | | | | | | | | | | | Fixes trac issue #656. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | movenc: add some default cases.Reimar Döffinger2012-03-31
| | | | | | | | | | | | | | | | This fixes crashes when copying a data track as in trac issue #236. No proper timecode tracks will be written though. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | MOV: Fix old-style muxed raw-audio data.Reimar Döffinger2012-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the sample from trac issue #522. The issue is that the mov demuxer insists on using its calculated sample_size (which is nonsense for old-style tracks) instead of the one encoded in the track. The old raw audio code should be using the value in stsz, because the size of a single sample never makes sense for the size of a full audio packet, whereas the new code will multiply the sample size by the chunk size, so it should use the calculated value. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | MOV: bail out to toplevel when encountering a trak or mdat chunk.Reimar Döffinger2012-03-31
| | | | | | | | | | | | | | | | | | This patch fixes the sample from trac issue #733. The issue is that the size of the trak elements is coded too large, so that the next trak element would be parsed as part of the first and truncated incorrectly. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing() h264: Make ff_h264_decode_end() static, it is not used externally. output-example: K&R formatting cosmetics, comment spelling fixes avf: make the example output the proper message avf: fix audio writing in the output-example mov: don't overwrite existing indexes. lzw: fix potential integer overflow. truemotion: forbid invalid VLC bitsizes and token values. truemotion2: handle out-of-frame motion vectors through edge extension. configure: Check for a different SDL function Conflicts: configure doc/examples/muxing.c libavcodec/truemotion2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output-example: K&R formatting cosmetics, comment spelling fixesDiego Biurrun2012-03-30
| |
| * avf: make the example output the proper messageLuca Barbato2012-03-29
| | | | | | | | | | av_dump_format needs the codecs opened in order to print them.
| * avf: fix audio writing in the output-exampleLuca Barbato2012-03-29
| | | | | | | | | | av_init_packet does not reset data and size fields in AVPacket, avcodec_encode_audio2 can use preallocated AVPacket.
| * mov: don't overwrite existing indexes.Ronald S. Bultje2012-03-29
| | | | | | | | | | | | | | | | Prevents all kind of badness if files contain multiple indexes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | libavformat: Fix several "incompatible pointer type" warnings.Michael Niedermayer2012-03-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mp3dec: perform I/S and M/S only when frame mode is joint stereo. id3v2: add another mimetype for JPEG image lzw: prevent buffer overreads. WMAL: Remove inaccurate and unnecessary doxy h264: fix cabac-on-stack after safe cabac reader. truemotion2: convert packet header reading to bytestream2. Conflicts: libavcodec/lzw.c libavcodec/truemotion2.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>