summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/matroskadec: make sipr_bit_rate static constMichael Niedermayer2013-08-04
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mpegtsenc: add option tables_versionAndrey Utkin2013-08-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer2013-08-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7950e519bb094897f957b9a9531cc60ba46cbc91': Disable deprecation warnings for cases where a replacement is available Conflicts: libavcodec/avpacket.c libavcodec/pthread.c libavcodec/utils.c libavdevice/v4l2.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Disable deprecation warnings for cases where a replacement is availableDiego Biurrun2013-08-02
| |
* | Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays Conflicts: libavcodec/options_table.h libavfilter/avfilter.c libavformat/options_table.h libswscale/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give less generic names to global library option arraysDiego Biurrun2013-08-02
| |
* | Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | | | * commit '0d6fa3977b016f1b72b0b24b8834ff9222498548': rtmp: Add seek support Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Add seek supportGavriloaie Eugen-Andrei2013-08-02
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/matroskaenc: make 2 tables static that are not used outside matroskaencMichael Niedermayer2013-08-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: make uuids static constMichael Niedermayer2013-08-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flvdec: silence unused warningMichael Niedermayer2013-08-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | * commit 'f900f35ac8db4ac30df6fda1c27502c2ef9e6ba5': flvdec: Eliminate completely silly goto Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Eliminate completely silly gotoDiego Biurrun2013-08-01
| |
* | Merge commit 'e4529df944616917ae8462f5102253ff7f983093'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | | | | | | | * commit 'e4529df944616917ae8462f5102253ff7f983093': flvdec: K&R formatting cosmetics Conflicts: libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: K&R formatting cosmeticsDiego Biurrun2013-08-01
| |
* | Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | * commit '390b4d7088b5cecace245fee0c54a57e24dabdf4': flvdec: Fix = vs. == typo in sample rate check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: Fix = vs. == typo in sample rate checkDiego Biurrun2013-08-01
| |
* | Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'Michael Niedermayer2013-08-02
|\| | | | | | | | | | | | | * commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423': rtsp: Simplify code for forming the remote peer url Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Simplify code for forming the remote peer urlMartin Storsjö2013-08-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | mpegts: save last pcr of pcr pids in PES ContextMarton Balint2013-08-02
| | | | | | | | | | | | | | | | Based on a patch by Reimar Döffinger. http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/movenc: Write disc number and total number of discs as part of metadata.Carl Eugen Hoyos2013-08-01
| | | | | | | | Fixes ticket #2731.
* | lavf/movenc: Write total number of tracks as part of metadata.Carl Eugen Hoyos2013-08-01
| | | | | | | | Fixes ticket #2157.
* | Merge commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2'Michael Niedermayer2013-08-01
|\| | | | | | | | | | | | | * commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2': rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_urlMartin Storsjö2013-08-01
| | | | | | | | | | | | | | | | | | | | A separate rtcp port can already be set when opening the rtp protocol normally, but when doing port setup as in RTSP (where we first need to open the local ports and pass them to the peer, and only then receive the remote peer port numbers), we didn't check the same url parameter as in the normal open routine. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1851e1d05d06f6ef3436c667e4354da0f407b226'Michael Niedermayer2013-08-01
|\| | | | | | | | | | | | | * commit '1851e1d05d06f6ef3436c667e4354da0f407b226': rtpproto: Check the size before reading buf[1] Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Check the size before reading buf[1]Martin Storsjö2013-08-01
| | | | | | | | | | | | | | | | I doubt that anyone ever would try to send a 1 byte packet via the RTP protocol, but check just in case - it shouldn't crash at least. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5'Michael Niedermayer2013-08-01
|\| | | | | | | | | | | | | * commit 'b7e6da988bfd5def40ccf3476eb8ce2f98a969a5': rtpproto: Move rtpproto specific function declarations to a separate header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Move rtpproto specific function declarations to a separate headerMartin Storsjö2013-07-31
| | | | | | | | | | | | | | Mixing these with the rtp depacketizer functions in rtpdec.h is no good. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'Michael Niedermayer2013-08-01
|\| | | | | | | | | | | | | * commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec': rtpproto: Simplify the rtp_read function by looping over the fds Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Simplify the rtp_read function by looping over the fdsMartin Storsjö2013-07-31
| | | | | | | | | | | | | | This avoids having duplicate code where only the fd parameter differs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'Michael Niedermayer2013-08-01
|\| | | | | | | | | | | | | * commit '7531588fffbca1f0afdcc06635999c00dfc16ca6': rtpproto: Remove a misplaced comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Remove a misplaced commentMartin Storsjö2013-07-31
| | | | | | | | | | | | | | The fdset is a pollfd array nowadays, and it is already populated at this point. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e'Michael Niedermayer2013-08-01
|\| | | | | | | | | | | | | * commit '54e03ff6af8a070f1055edd26028f3f7b2e2ca8e': rtpproto: Support nonblocking reads Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Support nonblocking readsMartin Storsjö2013-07-31
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2e814d0329aded98c811d0502839618f08642685'Michael Niedermayer2013-08-01
|\| | | | | | | | | | | | | * commit '2e814d0329aded98c811d0502839618f08642685': rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Simplify code by introducing a macro for rescaling NTP timestampsMartin Storsjö2013-07-31
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | file: Add 'blocksize' optionAndrey Utkin2013-07-31
| | | | | | | | | | | | | | | | | | | | | | | | | | Interruptibility of file operations is strongly desirable in case of slow storage access, e.g. mounted network share. This commit introduces possibility to limit data quantity transferred by 'file' protocol at once. By default, old behaviour is preserved and data is still tried to be transferred without block size limitation. Note that file I/O operation still may block (or even freeze) inside of single read(2) or write(2) operation. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-31
|\| | | | | | | | | | | | | | | | | | | * qatar/master: hls: Call avformat_find_stream_info() on the chained demuxers Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Call avformat_find_stream_info() on the chained demuxersMichael Niedermayer2013-07-30
| | | | | | | | | | | | | | | | | | This allows the chained demuxer (or more precisely, the lavf utility code) to better fill in timestamps on packets from these, especially for cases where one stream is a raw ADTS stream. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/webvttenc: use proper printf format for int64_t valuesPaul B Mahol2013-07-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | asfdec: Skip to keyframe after seekingMichael Niedermayer2013-07-30
| | | | | | | | | | | | Fixes Ticket1616 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/gxfenc: replace deprecated PIX_FMT constantsMichael Niedermayer2013-07-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1f57d60129b0e297cd197c6031c4439b30a6b503'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | * commit '1f57d60129b0e297cd197c6031c4439b30a6b503': rtsp: Support RFC4570 (source specific multicast) more properly. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Support RFC4570 (source specific multicast) more properly.Ed Torbett2013-07-29
| | | | | | | | | | | | | | Add support for domain names, for multiple source addresses, for exclusions, and for session level specification of addresses. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | | | | | | | * commit '74972220909787af5a3ffe66f7fa8041827c2bd2': rtpproto: Support more than one SSM include address, support excludes Conflicts: libavformat/rtpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Support more than one SSM include address, support excludesEd Torbett2013-07-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | | | | | | | * commit '7d99c92945e4b2d12ed2126365482e1900340da0': udp: Keep track of include and exclude sources separately Conflicts: libavformat/udp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Keep track of include and exclude sources separatelyEd Torbett2013-07-29
| | | | | | | | | | | | | | This allows us to explicitly fail if the caller tried to set both inclusions and exclusions at the same time. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | * commit '3357bccc5cb31795f248cd72dc480025f3075a5b': udp: Allow specifying multicast include/blocks as host names as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Allow specifying multicast include/blocks as host names as wellEd Torbett2013-07-29
| | | | | | | | | | | | | | | | Previously this only allowed literal IP addresses. When these are conveyed in a SDP file as in RFC4570, host names are allowed as well. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 15:17:00 +0000