summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Fix alaw and mulaw muxing in caf.Carl Eugen Hoyos2014-05-17
| | | | Fixes ticket #3644.
* Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'Michael Niedermayer2014-05-17
|\ | | | | | | | | | | | | * commit '34e2ce5dde073244ccb2b62f930e96fe612690f7': hlsenc: Set the default codecs to AAC and H264 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: Set the default codecs to AAC and H264Martin Storsjö2014-05-17
| | | | | | | | | | | | Most HLS implementation only support these codecs. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avisynth: set duration of audio streamsHendrik Leppkes2014-05-16
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | rtmpproto: info out for unsupported auth varsReynaldo H. Verdejo Pinochet2014-05-16
| | | | | | | | | | | | Should aid debugging badly formatted URLs Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | rtmpproto: avoid setting auth var value if nullReynaldo H. Verdejo Pinochet2014-05-16
| | | | | | | | | | | | | | | | | | | | | | Use default values if parsed variable is found not to have any value. Avoids crashing at strlen for salt/user on the auth call afterwards and needless NULL assignments for the rest (default is already NULL for those). Should fix Coverity Scan issues #966644 and #966645 Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | estimate_timings_from_pts: Execute max 1 iteration extra to find more than 1 ↵Michael Niedermayer2014-05-16
| | | | | | | | | | | | duration Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Try to get the duration for all streamsGaullier Nicolas2014-05-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: simplify filesize end checkMichael Niedermayer2014-05-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Also consider packet durationGaullier Nicolas2014-05-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | estimate_timings_from_pts: Warn about A/V streams for which no duration ↵Gaullier Nicolas2014-05-16
| | | | | | | | | | | | could be set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'Michael Niedermayer2014-05-15
|\| | | | | | | | | | | | | | | | | | | * commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf': lavf: drop the zero-sized packets hack Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: drop the zero-sized packets hackAnton Khirnov2014-05-15
| | | | | | | | | | | | There should not be any valid reason anymore for passing completely empty packets to lavf. OTOH side data-only packets can be useful.
* | Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'Michael Niedermayer2014-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52': lavf: add AVFMT_FLAG_BITEXACT. Conflicts: doc/APIchanges libavformat/avformat.h libavformat/flacenc.c libavformat/movenc.c libavformat/oggenc.c libavformat/options_table.h libavformat/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add AVFMT_FLAG_BITEXACT.Anton Khirnov2014-05-15
| | | | | | | | | | | | | | | | Use it instead of checking CODEC_FLAG_BITEXACT in the first stream's codec context. Using codec options inside lavf is fragile and can easily break when the muxing codec context is not the encoding context.
* | libavformat/mov: Elimitate double reading of COVR metadata if ↵Alex Sukhanov2014-05-15
| | | | | | | | | | | | | | | | | | | | | | MOV_EXPORT_ALL_METADATA is enabled Problem: ffmpeg tries to read COVR atom data twice if MOV_EXPORT_ALL_METADATA is enabled. If COVR atom is the last in the stream, a parsing of such file fails. Solution: just return immediatelly after mov_read_covr Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/libnut: use av_mallocz_array()Michael Niedermayer2014-05-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: use av_mallocz_array()Michael Niedermayer2014-05-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: remove never twice executable loopMichael Niedermayer2014-05-14
| | | | | | | | | | | | | | Fixes CID1197069 Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'Michael Niedermayer2014-05-14
|\| | | | | | | | | | | | | * commit 'a738540366c9b114949b7914c0d08e2c28982cfb': lavf: properly document the distinction between flags and ctx_flags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: properly document the distinction between flags and ctx_flagsAnton Khirnov2014-05-14
| |
* | Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'Michael Niedermayer2014-05-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '449511740f06a4675b0066730fa45cdb764ffafc': build: handle library dependencies in configure Conflicts: common.mak configure libavdevice/Makefile libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: handle library dependencies in configureJanne Grunau2014-05-13
| | | | | | | | | | Instead of setting FFLIBS in each library Makefile configure exports FFLIBS-$library in config.mak.
* | Support broadcast destination for udp protocolOlivier Langlois2014-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the required socket option SO_BROADCAST to be able to stream to a broadcast address. Prior to the patch, trying to stream to a broadcast address was resulting to the following error: av_interleaved_write_frame(): Permission denied The patch has been tested with: ffmpeg -f v4l2 -framerate 30 -input_format yuyv422 -video_size 640x480 -i /dev/video0 \ -c:v libx264 -profile:v high -preset ultrafast -tune zerolatency -b:v 500k -pix_fmt yuv420p \ -f mpegts udp://192.168.1.255:5004?broadcast=1 I have added an option to let the user explicitly request broadcast in order to avoid ffmpeg to broadcast unintentionally. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfenc: honor the maximum of 63 payloadsAaron Graham2014-05-13
| | | | | | | | | | | | Fixes Ticket3634 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: check the number of frames per buffer sizeMichael Niedermayer2014-05-12
| | | | | | | | | | | | Fixes misdetection of issue3327-libc-2.17.so Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: if the id3 tag is too large for data after it to become ↵Michael Niedermayer2014-05-12
| | | | | | | | | | | | available, use the full AVPROBE_SCORE_EXTENSION if extension matches Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: limit probe score in the id3 case only if there is a chance ↵Michael Niedermayer2014-05-12
| | | | | | | | | | | | | | | | that data after the id3 tag will become available Fixes ticket3327 (sample.mp3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use Matroska document version 2 for WebM files if possible.Carl Eugen Hoyos2014-05-12
| | | | | | | | | | | | | | Google's plugin for the Internet Explorer refuses to play files with another document version. Fixes ticket #3583.
* | avformat/mpegtsenc: fix minor typo in omit_video_pes_length descriptionAman Gupta2014-05-11
| | | | | | | | | | Signed-off-by: Aman Gupta <ffmpeg@tmm1.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Check ff_put_wav_header() return codeMichael Niedermayer2014-05-10
| | | | | | | | | | Fixes CID1212260 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtpdec: make the NTP time values unsigned.Diego Elio 'Flameeyes' Pettenò2014-05-09
| | | | | | | | | | | | | | | | As per RFC3550, section 4, the NTP time is provided as 64-bit unsigned integer, so follow the same logic here. Reviewed-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e'Michael Niedermayer2014-05-08
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e': rtmpproto: Check the buffer sizes when copying app/playpath strings Conflicts: libavformat/rtmpproto.c See: 0c2a6dabced53b4df57aedf47f0c1b8233035fed See: 02ac3398eb52679301028c2fd3ebad1b6261b4da Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Check the buffer sizes when copying app/playpath stringsMartin Storsjö2014-05-08
| | | | | | | | | | | | | | As pointed out by Reimar Döffinger. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/rtmpproto: add FFMIN() to av_strlcpy()Michael Niedermayer2014-05-08
| | | | | | | | | | Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: use av_fifo_freepLukasz Marek2014-05-07
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | avformat/utils: fix const warningsMichael Niedermayer2014-05-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/h263dec/h263_probe: Check TRMichael Niedermayer2014-05-07
| | | | | | | | | | | | Fixes missdetection of Misdetection_345.mp3 Fixes missdetection of Misdetection_421.mp3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/h263dec/h263_probe: Check PSC bit 9 and 13 inMichael Niedermayer2014-05-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/h263dec: shift data in state to make more bits available to probeMichael Niedermayer2014-05-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'Michael Niedermayer2014-05-07
|\| | | | | | | | | | | | | * commit '7ce3bd9614717e545af8fb8455032c807e389b78': rtmpproto: Support alternative slist parameter in rtmp URLs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Support alternative slist parameter in rtmp URLsUwe L. Korn2014-05-06
| | | | | | | | | | | | | | | | | | | | | | | | Support the URL scheme where the playpath is in an RTMP URL is passed as the slist argument and the app is given infront of the query part of the URL: rtmp://host[:port]/[app]?slist=[playpath] (other arguments in the query part are stripped as they are not used) Signed-off-by: Martin Storsjö <martin@martin.st>
| * probe: Support AAC_LATM in set_codec_from_probe_dataLuca Barbato2014-05-03
| |
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-05-06
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: mpegts: always reset pes packet state on new packet mpegts: unref buffer in reset_pes_packet_state mpegts: factorize pes packet state reset function mpegts: fix indentation after last commit mpegts: only emit new packets if data buffer exists mpegts: remove uneeded buf_size check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpegts: always reset pes packet state on new packetMarton Balint2014-05-05
| | | | | | | | | | | | | | | | | | Fixes ticket #3584. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpegts: unref buffer in reset_pes_packet_stateMarton Balint2014-05-05
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpegts: factorize pes packet state reset functionMarton Balint2014-05-05
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpegts: fix indentation after last commitMarton Balint2014-05-05
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpegts: only emit new packets if data buffer existsMarton Balint2014-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think this can acutally happen in the current code, but better safe than sorry. Fixes Coverity CID 732217. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | mpegts: remove uneeded buf_size checkMarton Balint2014-05-05
| | | | | | | | | | | | | | | | | | It is already ensured by the loop condition Signed-off-by: Marton Balint <cus@passwd.hu>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 07:33:15 +0000