summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'Michael Niedermayer2012-10-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e002e3291e6dc7953f843abf56fc14f08f238b21': Use the new aes/md5/sha/tree allocation functions avutil: Add functions for allocating opaque contexts for algorithms svq3: fix pointer type warning svq3: replace unsafe pointer casting with intreadwrite macros parseutils-test: various cleanups Conflicts: doc/APIchanges libavcodec/svq3.c libavutil/parseutils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use the new aes/md5/sha/tree allocation functionsMartin Storsjö2012-10-11
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | rtmpproto: fix out of array writeMichael Niedermayer2012-10-12
| | | | | | | | | | Fixes CID732263 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtspdec:read_line: fix use of uninitialized byteMichael Niedermayer2012-10-12
| | | | | | | | | | | | Fixes CID732301 Fixes CID723300 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | update_initial_timestamps: increase pts_buffer sizeMichael Niedermayer2012-10-12
| | | | | | | | | | Fixes CID733786 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bethsoftvid: check return value of av_packet_new_side_data()Paul B Mahol2012-10-11
| | | | | | | | | | | | Fixes null pointer dereference, fixes CID733777. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: return error if no segments are available in ↵Janne Grunau2012-10-10
| | | | | | | | | | | | mxf_get_sorted_table_segments Fixes CID732275.
* | Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c': vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures segment: support applehttp style list Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: support applehttp style listLuca Barbato2012-10-10
| |
* | Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6': avio: introduce avio_closep mpegtsenc: set muxing type notification to verbose vc1dec: Use correct spelling of "opposite" a64multienc: change mc_frame_counter to unsigned arm: call arm-specific rv34dsp init functions under if (ARCH_ARM) svq1: Drop a bunch of useless parentheses parseutils-test: do not print numerical error codes svq1: K&R formatting cosmetics Conflicts: doc/APIchanges libavcodec/svq1dec.c libavcodec/svq1enc.c libavformat/version.h libavutil/parseutils.c tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: introduce avio_closepLuca Barbato2012-10-10
| |
| * mpegtsenc: set muxing type notification to verboseLuca Barbato2012-10-10
| |
* | Fix broken timestamps for some mp3 in avi samples.Carl Eugen Hoyos2012-10-10
| | | | | | | | | | Mostly based on 73ad355 by Michael Niedermayer. Fixes ticket #606.
* | lavf: do not prematurely accept a format with low score in init_input()Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: detect .raw files only with a low score as img2Michael Niedermayer2012-10-10
| | | | | | | | | | | | They can be many other things and this otherwise breaks probing of some .raw files. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add a AVPROBE_SCORE_RETRY instead of using hardcoded values.Michael Niedermayer2012-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dtshd: fix seekingPaul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avidec: fix 10l typoMichael Niedermayer2012-10-10
| | | | | | | | | | found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: override sample size of 1024 for VBR AACMichael Niedermayer2012-10-10
| | | | | | | | | | | | Fixes Ticket1755 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | takdec: fix seekingPaul B Mahol2012-10-10
| | | | | | | | | | | | The previous approach was just wrong. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d0beefbf6ee6dbf8efb522a9307e54c6ed5f702': swscale: Do not make ff_ symbols globally visible. rtspdec: use av_strlcpy for writing into fixed size buffer g722enc: fix size argument in memset http: use av_strlcpy instead of strcpy() without size checks avfilter: correct memcpy size avfilter_copy_buf_props() lavc: split asv12 encoder/decoder Conflicts: libavcodec/asvdec.c libavfilter/buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtspdec: use av_strlcpy for writing into fixed size bufferJanne Grunau2012-10-09
| | | | | | | | Fixes CID231347.
| * http: use av_strlcpy instead of strcpy() without size checksJanne Grunau2012-10-09
| | | | | | | | Fixes CID700730.
* | dtshd: remove redundant/wrong avio_tell()Paul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | takdec: remove redundant/wrong avio_tell()Paul B Mahol2012-10-10
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a': cmdutils_read_file: increment *size after writing the trailing \0 af_resample: unref out_buf when avresample_convert returns 0 af_amix: prevent memory leak on error path vc1dec: prevent memory leak in error path vc1dec: prevent memory leak on av_realloc error af_channelmap: free old extended_data on reallocation avconv: simplify memory allocation in copy_chapters matroskaenc: check cue point validity before reallocation swfenc: error out for more than 1 audio or video stream build: link test programs only against static libs Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: check cue point validity before reallocationJanne Grunau2012-10-09
| | | | | | | | | | Prevents memory leak and possible access to freed memory. Fixes CID605744.
| * swfenc: error out for more than 1 audio or video streamJanne Grunau2012-10-09
| | | | | | | | Prevents CID602000.
* | Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'Michael Niedermayer2012-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f': adxdec: use planar sample format adpcmdec: use planar sample format for adpcm_thp adpcmdec: use planar sample format for adpcm_ea_xas adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3 adpcmdec: use planar sample format for adpcm_xa adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3 adpcmdec: use planar sample format for adpcm_4xm adpcmdec: use planar sample format for adpcm_ima_wav adpcmdec: use planar sample format for adpcm_ima_qt pcmdec: use planar sample format for pcm_lxf mace: use planar sample format atrac1: use planar sample format build: non-x86: Only compile mpegvideo optimizations when necessary rtpdec_mpeg4: au_headers is a single array, simple av_free is enough avcodec: free extended_data instead address of it fate: Add tests of the ff_make_absolute_url function url: Handle relative urls starting with two slashes url: Handle relative urls being just a new query string url: Don't treat slashes in query parameters as directory separators Conflicts: libavcodec/adxdec.c libavcodec/mips/Makefile libavcodec/pcm.c libavcodec/utils.c libavformat/Makefile libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_mpeg4: au_headers is a single array, simple av_free is enoughJanne Grunau2012-10-09
| | | | | | | | Fixes CID700204.
| * fate: Add tests of the ff_make_absolute_url functionMartin Storsjö2012-10-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Handle relative urls starting with two slashesDuncan Salerno2012-10-09
| | | | | | | | | | | | This is defined by RFC 3986 section 5.4.1 to be handled this way. Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Handle relative urls being just a new query stringDuncan Salerno2012-10-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * url: Don't treat slashes in query parameters as directory separatorsDuncan Salerno2012-10-09
| | | | | | | | | | | | | | Strip off query parameters from the original url before applying the new relative path. Signed-off-by: Martin Storsjö <martin@martin.st>
* | crypto should allow passing of options to the underlying protocol via the ↵Duncan Salerno2012-10-09
| | | | | | | | | | | | url_open2 interface Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix second use of AVOptions in HLSDuncan Salerno2012-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | http: add 'timeout' AVOptionAndrey Utkin2012-10-09
| | | | | | | | | | | | This option is passed though to underlying tcp protocol context Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tcp: accept params through avio_open2() optionsAndrey Utkin2012-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tcp: use timeout option consistentlyAndrey Utkin2012-10-09
| | | | | | | | | | | | Default _connection_ timeout value 5 seconds is left as i/o timeout also Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Introduce ff_network_wait_fd_timeout()Andrey Utkin2012-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mingw/cygwin: Stop adding -fno-common to gcc CFLAGS Restructure av_log_missing_feature message rtp: Support packetization/depacketization of opus file: Set the return value type for lseek to int64_t. ppc: fix Altivec build with old compilers build: add LTO support for PGI compiler build: add -Mdse to PGI optimisation flags rtpenc_vp8: Update the packetizer to the latest spec version rtpdec_vp8: Make the depacketizer implement the latest spec draft doc: allow building with old texi2html versions avutil: skip old_pix_fmts.h since it is just a list Conflicts: libavcodec/aacdec.c libavcodec/h264.c libavcodec/ppc/fmtconvert_altivec.c libavcodec/utils.c libavformat/file.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Restructure av_log_missing_feature messageDiego Biurrun2012-10-09
| | | | | | | | | | | | | | | | Some invocations include a verb in the log message, others do not. Yet av_log_missing_feature expects callers to provide a verb. Change the function to include a verb instead and update the callers accordingly. The result is a more natural function API and correct English in the function invocations.
| * rtp: Support packetization/depacketization of opusMartin Storsjö2012-10-09
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * file: Set the return value type for lseek to int64_t.Yusuke Nakamura2012-10-09
| | | | | | | | | | | | This fixes a regression in 4ed5ac5. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc_vp8: Update the packetizer to the latest spec versionMartin Storsjö2012-10-08
| | | | | | | | | | | | Tested to work with the gstreamer depacketizer. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpdec_vp8: Make the depacketizer implement the latest spec draftMartin Storsjö2012-10-08
| | | | | | | | | | | | | | | | | | | | | | Not all details are implemented, but it's enough for proper playback as long as there is no packet loss. Tested to work with the packetizer in gstreamer (which although uses a different codec name, to clarify that it is still a spec draft). Signed-off-by: Martin Storsjö <martin@martin.st>
* | DTS-HD demuxerPaul B Mahol2012-10-09
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | movenc.c: Force correct value for "Samples per packet" for pcm audioTim Nicholson2012-10-09
| | | | | | | | | | | | Apple spec is for it to always be "1" for uncompressed audio. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) x86: call most of the x86 dsp init functions under if (ARCH_X86) doc: support the new website layout doc: remove a warning from filters.texi doc: initial nut documentation segment: drop global headers setting lavu: fix typo in Makefile Conflicts: doc/Makefile doc/filters.texi doc/t2h.init libavcodec/fmtconvert.c libavcodec/proresdsp.c libavcodec/x86/Makefile libavcodec/x86/vc1dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 03:35:25 +0000