summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* 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>
| * segment: drop global headers settingLuca Barbato2012-10-08
| | | | | | | | | | | | | | | | avconv provides an option to set it externally and there isn't a way for the outer demuxer to report the inner demuxer flag. Solves a bad interaction between mpegts and x264, but requires additional setting for the user.
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-08
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: af_resample: avoid conversion of identical sample formats for 1 channel avcodec: allow either planar or interleaved sample format when encoding mono adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order timefilter: De-doxygenize normal code comments and drop silly ones gxf: Include the right header for the avpriv_frame_rate_tab declaration Conflicts: libavcodec/adpcmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gxf: Include the right header for the avpriv_frame_rate_tab declarationMartin Storsjö2012-10-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | TAK demuxer, decoder and parserPaul B Mahol2012-10-08
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffserver: fix seeking with ?date=...Clément Bœsch2012-10-08
| | | | | | | | | | | | | | | | | | | | | | Regression since 5f847bf61dca1fd1a2f65a2f56c9a99d1cb716ab. After this commit, timestamps pushed by FFmpeg won't be relative anymore, but absolute (based on the date/time at the beginning of the push). This will allow seeking to work properly. Before this patch, the seek was done, but ffm timestamps were way smallers than the absolute requested timestamp (based on a date), so the seek was done, but to the end of the stream (which was similar to no effect at all).
* | mpegts: fuzzy crc check for not so spec compliant filesMichael Niedermayer2012-10-08
| | | | | | | | | | | | Fixes Ticket598 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfenc: fix av_log data type for dts paramaterMichael Niedermayer2012-10-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mux: change 1 assert->av_assert1()Michael Niedermayer2012-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: fix typo in commentPaul B Mahol2012-10-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | matroskaenc: remove MATROSKA_ID_VIDEODISPLAYUNIT 3Michael Niedermayer2012-10-07
| | | | | | | | | | | | | | Should fix ticket 1754 Thanks-to: Moritz Bunkus <moritz@bunkus.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wmaenc: use float planar sample format (e)ac3enc: use planar sample format aacenc: use planar sample format adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt adpcmenc: move 'ch' variable to higher scope adpcmenc: fix 3 instances of variable shadowing adpcm_ima_wav: simplify encoding libvorbis: use planar sample format libmp3lame: use planar sample formats vorbisenc: use float planar sample format ffm: do not write or read the audio sample format parseutils: fix parsing of invalid alpha values doc/RELEASE_NOTES: update for the 9 release. smoothstreamingenc: Add a more verbose error message smoothstreamingenc: Ignore the return value from mkdir smoothstreamingenc: Try writing a manifest when opening the muxer smoothstreamingenc: Move the output_chunk_list and write_manifest functions up smoothstreamingenc: Properly return errors from ism_flush to the caller smoothstreamingenc: Check the output UrlContext before accessing it Conflicts: doc/RELEASE_NOTES libavcodec/aacenc.c libavcodec/ac3enc_template.c libavcodec/wmaenc.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffm: do not write or read the audio sample formatJustin Ruggles2012-10-06
| |
| * smoothstreamingenc: Add a more verbose error messageMartin Storsjö2012-10-06
| | | | | | | | | | | | This helps tracking down the cause if this happens to be an issue. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Ignore the return value from mkdirMartin Storsjö2012-10-06
| | | | | | | | | | | | | | | | We don't need to return an error if the directory already existed. We make sure that the directory actually is properly writeable later within ism_write_header by writing a manifest anyway. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Try writing a manifest when opening the muxerMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This allows failing cleaner and earlier if unable to write to the output directory. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Move the output_chunk_list and write_manifest functions upMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This allows calling write_manifest from ism_write_header without a forward declaration. Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Properly return errors from ism_flush to the callerMartin Storsjö2012-10-06
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * smoothstreamingenc: Check the output UrlContext before accessing itMartin Storsjö2012-10-06
| | | | | | | | | | | | | | This code can be called with a NULL UrlContext if writing of the trailer involves seeking. Signed-off-by: Martin Storsjö <martin@martin.st>
* | movenc: support an alternative to edit lists to handle the first DTS != 0 case.Michael Niedermayer2012-10-07
| | | | | | | | | | | | | | | | | | | | Some software does not support edit lists at all, the adobe flash player seems to be one of these. Which results in AV sync errors when edit lists are used to adjust AV sync. 2nd try on implementing this, the first try had various issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix integer avoption typesMichael Niedermayer2012-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: fix regression with yuyv caused by c5f23dMichael Niedermayer2012-10-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yuv4mpeg: return proper error codes.Anton Khirnov2012-10-06
| | | | | | | | | | | | Fixes Bug 373. CC:libav-stable@libav.org
| * Give all anonymously typedeffed structs in headers a nameDiego Biurrun2012-10-06
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
* | segment: reverse pass avoid_negative_ts from the muxerMichael Niedermayer2012-10-06
| | | | | | | | | | | | This fixes failures with formats not supporting negative TS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Pinnacle TARGA CineWave YUV16 decoder (fourcc Y216).Carl Eugen Hoyos2012-10-06
| | | | | | | | Fixes ticket #1354
* | oggparsetheora: fix comment header parsingGiorgio Vazzana2012-10-05
| | | | | | | | | | | | Pass the correct header size to ff_vorbis_comment() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '65d12900432ac880d764edbbd36818431484a76e'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '65d12900432ac880d764edbbd36818431484a76e': configure: add --enable-lto option x86: cpu: Break out test for cpuid capabilities into separate function x86: ff_get_cpu_flags_x86(): Avoid a pointless variable indirection build: Factor out mpegaudio dependencies to CONFIG_MPEGAUDIO segment: Add comments about calls that only are relevant for some muxers segment: Add an option for omitting the first header and final trailer Conflicts: configure libavcodec/Makefile libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add comments about calls that only are relevant for some muxersMartin Storsjö2012-10-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * segment: Add an option for omitting the first header and final trailerMartin Storsjö2012-10-04
| | | | | | | | | | | | | | This allows writing totally bare segments, without any header/trailer included anywhere. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | * commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace': segment: Flush buffered data before finishing a segment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Flush buffered data before finishing a segmentMartin Storsjö2012-10-04
| | | | | | | | | | | | | | This makes sure any buffered data is written to the segment, for muxers that buffer up data internally (e.g. fragmented mp4). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f7b240434c015056bc6319ddbdb8483757cc13e2'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | * commit 'f7b240434c015056bc6319ddbdb8483757cc13e2': segment: Set the resend_headers flag for each segment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Set the resend_headers flag for each segmentMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | | | This makes sure new inline headers are emitted when the next packet is written. This allows segmenting mpegts without calling write_header/write_trailer (nor freeing/reiniting the muxer) for each segment. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | * commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e': segment: Add an option for disabling writing of a header/trailer to each segment Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add an option for disabling writing of a header/trailer to each segmentMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | Some segmented formats (such as fragmented mp4) are "bare", as in, the segment files do not have the same headers/trailers as full normal files of that format have. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'eb447d515956b3ce182d9750083131735f00324c'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | * commit 'eb447d515956b3ce182d9750083131735f00324c': segment: Free and reinit the muxer before calling avformat_write_header Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Free and reinit the muxer before calling avformat_write_headerMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | | | | | | | | | This makes sure the muxers are set up in the way they expect with no data left around from the previous run (which could cause various issues including memory leaks, depending on the chaine muxer). This fixes memory leaks with the mpegts and flv muxers. It also makes the usage of chained muxers correct. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | * commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87': segment: Use the public av_write_header/av_write_trailer functions Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Use the public av_write_header/av_write_trailer functionsMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | | | With this change, the segmenter muxer doesn't rely on anything not available/supported to libavformat external users, making the segmenter muxer do things just like a normal segmenter application using libavformat would do. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0edae4e6286096023cdd6adea74722fa06029867'Michael Niedermayer2012-10-05
|\| | | | | | | | | | | | | | | | | | | | | * commit '0edae4e6286096023cdd6adea74722fa06029867': segment: Properly create new AVStreams for the chained muxer segment: Add a missing space Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Properly create new AVStreams for the chained muxerMartin Storsjö2012-10-04
| | | | | | | | | | | | | | | | | | Before, the chained muxer reused the AVStreams array from the outer muxer, which made it impossible to use the proper public functions (such as av_write_frame) when calling the chained muxer. Signed-off-by: Martin Storsjö <martin@martin.st>
| * segment: Add a missing spaceMartin Storsjö2012-10-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | hls: Disable http seekability probingDuncan Salerno2012-10-05
| | | | | | | | | | | | | | Some HLS servers return 403 when the Range header is present. Disabling http seekability probing prevents the header from being added. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | http: prevent the Range header being sent when seekability probing isnt usedDuncan Salerno2012-10-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | http: add option to prevent probing for HTTP seekabilityDuncan Salerno2012-10-05
| | | | | | | | | | | | Add an tri-state (seek, non seek, automatic detection) option to HTTP to control seekability (default: automatic). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 15:07:11 +0000