aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'Michael Niedermayer2013-08-161-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb': hlsenc: Add a proper dependency on the mpegts muxer Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: Add a proper dependency on the mpegts muxerMartin Storsjö2013-08-151-1/+1
| | | | | | | | | | | | | | | | | | The hls muxer itself doesn't have any direct (object file level) dependencies on mpegtsenc.o, and including that object file directly doesn't ensure that it is registered so that the muxer actually is accessible. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2'Michael Niedermayer2013-08-161-1/+1
|\| | | | | | | | | | | | | * commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2': rtpproto: Check the right feature detection macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Check the right feature detection macroMartin Storsjö2013-08-151-1/+1
| | | | | | | | | | | | | | | | IPPROTO_IPV6 is unrelated here (it's only used in udp.c for multicast sockopts), check for support for the sockaddr_in6 struct itself. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '163a729725c6eb0081b0af41a7279f7d19aee86e'Michael Niedermayer2013-08-161-16/+8
|\| | | | | | | | | | | | | * commit '163a729725c6eb0081b0af41a7279f7d19aee86e': electronicarts: Let functions always returning the same value return void Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: Let functions always returning the same value return voidDiego Biurrun2013-08-151-20/+10
| |
* | Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'Michael Niedermayer2013-08-161-19/+19
|\| | | | | | | | | | | | | | | | | | | * commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529': electronicarts: Improve some function/variable names Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: Improve some function/variable namesDiego Biurrun2013-08-151-19/+19
| |
* | Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece'Michael Niedermayer2013-08-161-14/+12
|\| | | | | | | | | | | | | * commit 'a90cff137b2aca89380b0acad41cd7bb05619ece': electronicarts: comment wording fixes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: comment wording fixesDiego Biurrun2013-08-151-14/+12
| |
* | Merge commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c'Michael Niedermayer2013-08-161-12/+0
|\| | | | | | | | | | | | | * commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c': electronicarts: Remove bogus function documentation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: Remove bogus function documentationDiego Biurrun2013-08-151-12/+0
| |
* | Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'Michael Niedermayer2013-08-161-152/+204
|\| | | | | | | | | | | | | | | | | | | * commit '8747fce91fca6bb8e9936497f2de05c905cf43b5': electronicarts: K&R formatting cosmetics Conflicts: libavformat/electronicarts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: K&R formatting cosmeticsDiego Biurrun2013-08-151-154/+211
| |
* | avformat/riff: add DM4V FourCCPiotr Bandurski2013-08-151-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-151-2/+2
|\| | | | | | | | | | | | | * qatar/master: rtpproto: Check for the right feature when reading a sockaddr_in6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Check for the right feature when reading a sockaddr_in6Dave Yeo2013-08-151-2/+2
| | | | | | | | | | | | | | Some systems, such as OS/2, define AF_INET6 without a full implementation. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/wavdec: Fix seeking in files with unaligned offsetsAlexander Strasser2013-08-141-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | A file with a prepended ID3 tag of an uneven length was found in the wild. Check if the wav data starts at an uneven offset and use that information to correct the seeking calculation in wav_seek_tag, which used to only seek to even byte positions. Regression since ac87eaf856e0fb51917266b899bb15d19b907baf Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-142-3/+7
|\| | | | | | | | | | | | | * qatar/master: sdp: Add an option for sending RTCP packets to the source of the last packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sdp: Add an option for sending RTCP packets to the source of the last packetsMartin Storsjö2013-08-142-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An SDP description normally only contains the target IP address and port for the packets. This means that we don't really have any clue where to send the RTCP RR packets - previously they're sent to the destination IP written in the SDP (at the same port), which rarely is the actual peer. And if the source for the packets is on a different port than the destination, it's never correct. With a new option, we can choose to send the packets to the address that the latest packet on each socket arrived from. --- Some may even argue that this should be the default - perhaps, but I'd rather keep it optional at first. Additionally, I'm not sure if sending RTCP RR directly back to the source is desireable for e.g. multicast. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6b58e11a8331690ec32e9869db89ae10c54614e9'Michael Niedermayer2013-08-141-5/+84
|\| | | | | | | | | | | | | * commit '6b58e11a8331690ec32e9869db89ae10c54614e9': rtpproto: Add an option for writing return packets to the address of the last received packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Add an option for writing return packets to the address of the ↵Martin Storsjö2013-08-141-5/+84
| | | | | | | | | | | | | | | | | | | | | | last received packets If we've received packets on the same socket before, the return packets are sent to that address. If we've only received packets on the other socket, try to guess the source port for the other one assuming the basic +1/-1 logic. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'Michael Niedermayer2013-08-141-1/+2
|\| | | | | | | | | | | | | * commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6': rtpproto: Update the parameter documentation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Update the parameter documentationMartin Storsjö2013-08-131-1/+2
| | | | | | | | | | | | | | | | Move the sources documentation up below the marker for deprecated otpions. Also mention the new block parameter, that was added in 749722209. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5268bd2900effa59b51e0fede61aacde5e2f0b95'Michael Niedermayer2013-08-141-0/+2
|\| | | | | | | | | | | | | * commit '5268bd2900effa59b51e0fede61aacde5e2f0b95': segafilm: Error out on impossible packet size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segafilm: Error out on impossible packet sizeLuca Barbato2013-08-131-0/+2
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'Michael Niedermayer2013-08-141-3/+3
|\| | | | | | | | | | | | | | | | | | | | | * commit '3562684db716d11de0b0dcc52748e9cd90d68132': ogg: Always alloc the private context in vorbis_header Conflicts: libavformat/oggparsevorbis.c See: 18b46a494ef3592d69f4638dac1ebb613c0f548d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: Always alloc the private context in vorbis_headerLuca Barbato2013-08-131-3/+3
| | | | | | | | | | | | | | It is possible to have an initial broken header and then valid packets. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | riff: add msn audio commentCompn2013-08-131-1/+1
| |
* | avformat/riff: treat msn audio like gsm_msPiotr Bandurski2013-08-131-0/+1
| | | | | | | | | | | | Fixes decoding of 4 files from Ticket2854 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.Alexis Ballier2013-08-133-25/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/version.h: Drop FF_API_OLD_AVIO (unused and undefined since ↵Alexis Ballier2013-08-131-3/+0
| | | | | | | | | | | | libavformat 55) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: call ff_read_frame_flush() in asf_read_pts()Michael Niedermayer2013-08-121-0/+1
| | | | | | | | | | | | | | | | | | flushing just the asf demuxer but not the cores buffers leads to inconsistencies and a "random" packet position which later causes an assertion failure Fixes Ticket2853 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2dec: fix typo (double "with with")Kirill Gavrilov2013-08-121-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ape: check avio_read() return valuewm42013-08-111-0/+2
| | | | | | | | | | | | This sets pkt->size to absurd values on failure otherwise. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/id3v2enc: use UTF-16 in id3v2.3 APIC frame only if non-ASCIIMark Harris2013-08-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the encoding of picture descriptions consistent with the encoding of other text id3 tags and works better with iTunes, which does not display pictures with some UTF-16 picture descriptions (including a UTF-16 empty string, i.e. BOM + terminator). It also saves a few bytes. Example: ffmpeg -f lavfi -i sine=b=4 -f lavfi -i smptebars -map 0:a -map 1:v \ -codec:a libmp3lame -codec:v mjpeg -id3v2_version 3 \ -metadata:s:v comment="Cover (front)" -t 3 -y out.mp3 This example does not set a picture description (-metadata:s:v title=) so an empty string is written in the id3v2.3 APIC frame. Without this patch, UTF-16 is used and the cover art does not display in iTunes. With the patch the cover art is displayed. (Note that iTunes does not display or have a way to set picture descriptions, only the picture itself, but nevertheless has trouble skipping some UTF-16 descriptions.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-113-12/+53
|\| | | | | | | | | | | | | * qatar/master: rtmp: Do not misuse memcmp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Do not misuse memcmpLuca Barbato2013-08-113-12/+53
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '8e1fe345577a42f99591caf8a06c447613449694'Michael Niedermayer2013-08-111-0/+7
|\| | | | | | | | | | | | | * commit '8e1fe345577a42f99591caf8a06c447613449694': rtmp: Detect and warn if the user tries to pass librtmp style parameters Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Detect and warn if the user tries to pass librtmp style parametersMartin Storsjö2013-08-101-0/+7
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ba5393a609c723ec8ab7f9727c10fef734c09278'Michael Niedermayer2013-08-113-73/+73
|\| | | | | | | | | | | | | * commit 'ba5393a609c723ec8ab7f9727c10fef734c09278': rtmp: rename data_size to size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: rename data_size to sizeLuca Barbato2013-08-103-73/+73
| |
* | Merge commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b'Michael Niedermayer2013-08-111-3/+5
|\| | | | | | | | | | | | | * commit '4ebc7d659f0da6c1305ca08cf4303959203fff4b': rtmp: Use PRId64 when needed. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Use PRId64 when needed.Luca Barbato2013-08-101-3/+5
| |
* | avformat/tedcaptionsdec: make const arrays static constMichael Niedermayer2013-08-101-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-102-0/+3
|\| | | | | | | | | | | | | * qatar/master: libavutil: Make avpriv_open a library-internal function on msvcrt Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Make avpriv_open a library-internal function on msvcrtMartin Storsjö2013-08-102-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add one copy of the function into each of the libraries, similarly to what we do for log2_tab. When using static libs, only one copy of the file_open.o object file gets included, while when using shared libraries, each of them get a copy of its own. This fixes DLL builds with a statically linked C runtime, where each DLL effectively has got its own instance of the C runtime, where file descriptors can't be shared across runtimes. On systems not using msvcrt, the function is not duplicated. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'Michael Niedermayer2013-08-102-9/+21
|\| | | | | | | | | | | | | | | | | | | * commit '9d5ec50ead97e088d77317e77b18cef06cb3d053': ff_socket: put out-of-line and fallback to fcntl() for close-on-exec Conflicts: libavformat/network.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ff_socket: put out-of-line and fallback to fcntl() for close-on-execRémi Denis-Courmont2013-08-092-8/+20
| | | | | | | | | | | | | | This supports non-Linux systems (SOCK_CLOEXEC is non-standard) and older Linux kernels to the extent possible. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Integrate accessors.h header into internal.hReimar Döffinger2013-08-101-1/+0
| | | | | | | | | | | | | | I have no idea why I added a separate header, I think there is no good reason for it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:06:30 +0000