aboutsummaryrefslogtreecommitdiff
path: root/libavformat
AgeCommit message (Collapse)Author
2014-06-30avformat/hdsenc: Use av_mallocz_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30avformat/rtsp: use av_malloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28avformat/options_table: Fix flush_packet flag flagsMichael Niedermayer
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28avformat/mux: fix flush_packets flag with flushing buffersMichael Niedermayer
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28Merge commit '39975acc699c83af0a87a7318c0f41e189142938'Michael Niedermayer
* commit '39975acc699c83af0a87a7318c0f41e189142938': rtpenc_jpeg: check for color_range too Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-28rtpenc_jpeg: check for color_range tooVittorio Giovara
2014-06-27avformat/mxfenc: rename very recently added option to set/force channelcount ↵Gaullier Nicolas
in MXF D-10 Approved-by: Tomas Härdin <tomas.hardin@codemill.se> Approved-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df'Michael Niedermayer
* commit '3f4edf012593c73941caa0ef9b292da00225c3df': dump_stream: print the timebase as is, do not reduce it See: 75511c293add07db1cca58dcd8b08c33fc2f1075 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26dump_stream: print the timebase as is, do not reduce itAnton Khirnov
It makes more sense to print the timebase exactly as it is set. Also, this avoids a divide by zero when av_dump_format() is called on a format context before writing the header.
2014-06-26avformat/mxfenc: set/force channelcount in MXF D-10Gaullier Nicolas
There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24avformat/nutdec: improve probe speed by 30%Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24avformat/wavenc: simplify malloc failure checkingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24avformat/wavenc: more specific error return for "Writing 16 bit peak for 8 ↵Michael Niedermayer
bit audio" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24avformat/wavenc: do not hardcode array size in memset and other functionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24avformat/wavenc: use the bitexact flag from avformat instead of the one from ↵Michael Niedermayer
avcodec Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24Peak Envelope Chunk encoder: IndentGeorg Lippitsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-24EBU Tech 3285 - Supplement 3 - Peak Envelope Chunk encoderGeorg Lippitsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28'Michael Niedermayer
* commit 'f2f2e7627f0c878d13275af5d166ec5932665e28': Check mp3 header before calling avpriv_mpegaudio_decode_header(). Conflicts: libavformat/mp3enc.c See: 2dd0da787ce5008d4d1b8f461fbd1288c32e2c38 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22Check mp3 header before calling avpriv_mpegaudio_decode_header().Justin Ruggles
As indicated in the function documentation, the header MUST be checked prior to calling it because no consistency check is done there. CC:libav-stable@libav.org
2014-06-23Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'Michael Niedermayer
* commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd': build: Add missing object files for webm muxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'Michael Niedermayer
* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9': build: Add missing object files for Matroska demuxer Conflicts: libavcodec/Makefile libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23Merge commit '49470b9404583ab3aff6835f78a759349d331696'Michael Niedermayer
* commit '49470b9404583ab3aff6835f78a759349d331696': build: Add missing replaygain object file for CAF demuxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22Replace av_malloc() and memset(0) by av_mallocz()Diego Biurrun
2014-06-22build: Add missing object files for webm muxerDiego Biurrun
2014-06-22build: Add missing object files for Matroska demuxerDiego Biurrun
2014-06-22build: Add missing replaygain object file for CAF demuxerDiego Biurrun
2014-06-21avformat/flvdec: give live_flvdec a separate nameMichael Niedermayer
This should fix a infinite loop on freebsd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-21Show duration for large asf files as written in the file header.Carl Eugen Hoyos
Fixes ticket #3428.
2014-06-21build: Add missing object file for Matroska demuxerDiego Biurrun
Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2014-06-20fix several typosMoritz Barsnick
2014-06-19avformat/utils: better probing for duration in estimate_timings_from_pts()Gaullier Nicolas
It seems it is more secure to simply duplicate the computing routine from compute_pkt_fields to estimate_timings_from_pts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19lavf/Makefile: fix standalone compilation of live_flv demuxerJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit 'c385313d2590fd26e26bb9bdacddef78162ab490'Michael Niedermayer
* commit 'c385313d2590fd26e26bb9bdacddef78162ab490': rtsp: Support misordered fmtp rtpmap Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'Michael Niedermayer
* commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371': rtsp: Factor out fmtp parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18rtsp: Support misordered fmtp rtpmapJoshua Kordani
Issue present in Avigilon IP cameras.
2014-06-18rtsp: Factor out fmtp parsingLuca Barbato
2014-06-18avformat/mux: simplify ff_choose_timebase()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18dump_stream_format: fix division by 0Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer
* commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'Michael Niedermayer
* commit 'd754ed41727b1fcbab335b510248a9758a73320c': riffenc: take an AVStream instead of an AVCodecContext Conflicts: libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'Michael Niedermayer
* commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228': lavf: add the notimestamps flag to the muxers missing it Conflicts: libavformat/adtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18Merge commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016'Michael Niedermayer
* commit 'cfbdd7ffbd9fe14d110fd1bb89bf52f0f7bde016': rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebase Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov
Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
2014-06-18riffenc: take an AVStream instead of an AVCodecContextAnton Khirnov
It will be useful in the following commits. Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
2014-06-18lavf: add the notimestamps flag to the muxers missing itAnton Khirnov
2014-06-18rtpenc: base max_frames_per_packet on avg_frame_rate, not codec timebaseAnton Khirnov
Fall back to 1 (which is what is used for most cases anyway) when the framerate is not set.
2014-06-18Remove avserver.Anton Khirnov
It has not been properly maintained for years and there is little hope of that changing in the future. It appears simpler to write a new replacement from scratch than unbreaking it.
2014-06-18Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'Michael Niedermayer
* commit '74bc9458057f07c0820c3d3264396c4c64442e47': flvenc: Don't over-count metadata. Conflicts: tests/ref/lavf/flv_fmt tests/ref/vsynth/vsynth1-flashsv tests/ref/vsynth/vsynth1-flv tests/ref/vsynth/vsynth2-flashsv tests/ref/vsynth/vsynth2-flv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-17flvenc: Don't over-count metadata.Josh Allmann
Over-counting occurs if framerate is not set. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-16avformat/flvdec: Support live flv / NGINX RTMP streamsMichael Niedermayer
Fixes Ticket3553 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>