summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'Michael Niedermayer2015-03-041-18/+18
|\ | | | | | | | | | | | | | | | | | | * commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5': flv: Validate and reject unsupported codecs Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Validate and reject unsupported codecsLuca Barbato2015-03-041-16/+17
| | | | | | | | | | | | And provide a more informative message in case of failure. CC: libav-stable@libav.org
* | Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'Michael Niedermayer2015-03-042-15/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '25f613f8be3b51e4396b93cda131e4631ba54302': dca: Move syncword definitions to a separate header Conflicts: libavcodec/dca_parser.c libavformat/dtsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Move syncword definitions to a separate headerDiego Biurrun2015-03-042-13/+11
| |
* | Merge commit '1dc19729e92a96620000e09eba8e58cb458c9486'Michael Niedermayer2015-03-041-1/+0
|\ \ | |/ | | | | | | | | | | * commit '1dc19729e92a96620000e09eba8e58cb458c9486': rtpdec_asf: Don't free the payload context in the .close function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_asf: Don't free the payload context in the .close functionMartin Storsjö2015-03-041-1/+0
| | | | | | | | | | | | This was missed in bb4a310bb. This fixes a double free on close. Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavformat/mxfdec: refactor reading strong ref arrayMark Reid2015-03-041-39/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'Michael Niedermayer2015-03-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '2a66a580678dd9401f4d95e01e0958ca51864b6f': rtpdec_mpa_robust: Fix incrementing split_pos Conflicts: libavformat/rtpdec_mpa_robust.c See: ebf1f512e9916040dd96fa9f789ed4be5a39c349 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_mpa_robust: Fix incrementing split_posMartin Storsjö2015-03-041-1/+1
| | | | | | | | | | | | | | | | | | This fixes an oversight in 96084251, in a refactoring done on top of Gilles' original patch. Pointed out by Gilles Chanteperdrix. Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavformat/avienc: Fix duration of audio segment in OpenDML master indexTobias Rapp2015-03-041-1/+14
| | | | | | | | | | | | | | | | | | | | | | Fixes the duration field of the OpenDML master index "indx" chunk to contain the number of samples instead of the number of packets for (linear/PCM) audio streams. This matches the OpenDML V1.02 standard text which states that the duration field shall contain "time span in stream ticks". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'Michael Niedermayer2015-03-032-2/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '0af3b65880573aa9b3375362eaab4f84140c7dde': asf: do not export XMP metadata by default Conflicts: libavformat/asfdec.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asf: do not export XMP metadata by defaultVittorio Giovara2015-03-032-2/+8
| | | | | | | | | | | | | | | | | | | | | | Similarly to what has been done for MOV, display XMP metadata only when users explicitly require it. The Extensible Metadata Platform tag can contain various kind of data which are not strictly related to the video file, such as history of edits and saves from the project file. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * dashenc: Simplify code by using a local variableMartin Storsjö2015-03-021-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavformat/avio: added avio_put_str16beMark Reid2015-03-033-6/+27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfenc: adjust product name when opatom muxer is usedRobert Krüger2015-03-031-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dashenc: Update codec_str on extradata_size changeTimo Rothenpieler2015-03-021-1/+17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dashenc: Use local variable instead of duplicated dereferencesTimo Rothenpieler2015-03-021-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42'Michael Niedermayer2015-03-021-34/+15
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '91eee2af87278b3c2008f7a86d2cdfe6934e9f42': Revert "mov: Change DTS-based seek into CTS-based seek." Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "mov: Change DTS-based seek into CTS-based seek."Martin Storsjö2015-03-021-29/+15
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 4abfa387b8234736f6e0e541951e3d5eb60eb843. This commit broke playback of fragmented mp4 files with b-frames. While investigating this, it turned out that the general framework isn't ready for a PTS-based index yet. Revert this change until a better thought out solution is in place. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Revert "avformat/mov: Bypass av_add_index_entry()"Michael Niedermayer2015-03-021-3/+2
| | | | | | | | | | | | | | | | Next commit will revert the PTS seeking so this is not needed anymore This reverts commit 38e641a060e0c00930851a8053ca96250b3ecccc. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rm: limit packet sizeAndreas Cadhalpun2015-03-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chunk size is limited to 0xFFFF (written by avio_wb16), so make sure that the packet size is not too large. Such large frames need to be split into slices smaller than 64 kB, but that is currently supported neither by the rv10/rv20 encoders nor the rm muxer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> See Ticket244 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtpdec_mpa_robust: fix commit 96084251e57d1738fde02a2b0d37ca609d9efd71Gilles Chanteperdrix2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | Commit 96084251e57d1738fde02a2b0d37ca609d9efd71 introduced a change in the parser implementation which broke it. Restore the original implementation. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: Ignore max_delay if no other options remainMichael Niedermayer2015-03-011-11/+21
| | | | | | | | | | | | | | Fixes assertion failure Fixes Ticket4335 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA"Gilles Chanteperdrix2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 26524e358147aade6e9dd18fff42d61b966bbc70. If we want the T.140 codec to have the AV_CODEC_ID_TEXT codec id, its type needs to be AVMEDIA_TYPE_SUBTITLE, so, keep interpreting the text media type as AVMEDIA_TYPE_SUBTITLE. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: map T.140 RTP codec to textGilles Chanteperdrix2015-03-011-1/+1
| | | | | | | | | | | | | | | | This makes more sense than mapping to AV_CODEC_ID_SUBRIP. Nothing indicates that a T.140 track contains subrip sub-titles. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'Michael Niedermayer2015-03-014-49/+29
|\ \ | |/ | | | | | | | | | | * commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f': rtpenc: Don't set max_frames_per_packet based on the packet frame size or frame rate Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Don't set max_frames_per_packet based on the packet frame size or ↵Martin Storsjö2015-02-284-49/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame rate Instead check the timestamps while muxing, to avoid buffering a too long timestamp range into one single packet. This makes the AMR and AAC packetization slightly less efficient, since we set a possibly unnecessarily high max_frames_per_packet. (These packetizers end up doing a memmove of the TOC bytes if sending a packet before max_frames_per_packet is achieved, and we end up setting max_frames_per_packet to a value that should be high enough for most uses.) All packetizers that use max_frames_per_packet now set it either to a default value, or to a value calculated based on other parameters, so none of them rely on the previous default setting. For iLBC, copy one frame at a time, to allow checking the timestamp range for each of them - basically doing potentially multiple loops to simplify the code instead of trying to calculate the number of frames to buffer while honoring s1->max_delay. This is in preparation for reducing the coupling between libavformat and libavcodec, by not having the muxers use the encoder field frame_size (which may not be available during e.g. stream copy). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'Michael Niedermayer2015-03-013-4/+9
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2': rtpenc: Restructure if statements in packetizers to simplify adding more conditions Conflicts: libavformat/rtpenc_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Restructure if statements in packetizers to simplify adding more ↵Martin Storsjö2015-02-283-4/+9
| | | | | | | | | | | | | | | | | | | | conditions Factorize out the s->num_frames check at the start of the if statements, simplifying adding more alternative causes for sending the buffered frames. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd4c7fc02f9f59e721e76debf4a595df529707545'Michael Niedermayer2015-03-011-4/+0
|\ \ | |/ | | | | | | | | | | * commit 'd4c7fc02f9f59e721e76debf4a595df529707545': rtpenc: Skip redundant initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Skip redundant initializationMartin Storsjö2015-02-281-4/+0
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2'Michael Niedermayer2015-03-011-10/+11
|\ \ | |/ | | | | | | | | | | * commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2': rtpenc: Always do the default initialization regardless of codecs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Always do the default initialization regardless of codecsMartin Storsjö2015-02-281-10/+11
| | | | | | | | | | | | | | | | This avoids having to jump to the defaultcase in the switch. Manually override the stream time base back to 90 kHz for the few audio codecs that don't use the sample rate as time base (mp2, mp3). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'Michael Niedermayer2015-03-012-2/+1
|\ \ | |/ | | | | | | | | | | * commit '11edeaea3293c41ecf577a330422eabba35f76a2': rtpenc_xiph: Don't exclude headers from max_payload_size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_xiph: Don't exclude headers from max_payload_sizeMartin Storsjö2015-02-282-2/+1
| | | | | | | | | | | | | | This makes things more consistent by using the variable in the same way as in all other packetizers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'Michael Niedermayer2015-03-011-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '7c1e2e64667421f931ab48141517f19d309c7eea': rtpenc_xiph: Use AV_WB16 instead of manual bitshifts Conflicts: libavformat/rtpenc_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_xiph: Use AV_WB16 instead of manual bitshiftsMartin Storsjö2015-02-281-4/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8'Michael Niedermayer2015-03-011-8/+6
|\ \ | |/ | | | | | | | | | | * commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8': rtpenc_aac: Use AV_WB16 instead of manual bitshifts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_aac: Use AV_WB16 instead of manual bitshiftsMartin Storsjö2015-02-281-8/+6
| | | | | | | | | | | | This makes the code slightly more readable and understandable. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'Michael Niedermayer2015-03-011-3/+2
|\ \ | |/ | | | | | | | | | | * commit '9c9b0218e85fcd969308632f75af48a4ce229541': rtpenc_aac: Merge a definition with a declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_aac: Merge a definition with a declarationMartin Storsjö2015-02-281-3/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1fc64e2e07787bbca82a72c146588e850e6d098a'Michael Niedermayer2015-03-012-3/+6
|\ \ | |/ | | | | | | | | | | * commit '1fc64e2e07787bbca82a72c146588e850e6d098a': rtpenc: Write conditional statements on separate lines Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Write conditional statements on separate linesMartin Storsjö2015-02-282-3/+6
| | | | | | | | | | | | | | Intentionally keeping some conditional statements on single lines in rtpenc_h263.c. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0662440b991361fdb5e732712d997a73e4692e34'Michael Niedermayer2015-03-012-3/+4
|\ \ | |/ | | | | | | | | | | * commit '0662440b991361fdb5e732712d997a73e4692e34': rtpenc_aac: Set a default value for max_frames_per_packet at init Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_aac: Set a default value for max_frames_per_packet at initMartin Storsjö2015-02-282-3/+4
| | | | | | | | | | | | | | This avoids having to conditionally set the default within the packetizer function. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'Michael Niedermayer2015-03-011-1/+1
|\ \ | |/ | | | | | | | | | | * commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37': rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->bufMartin Storsjö2015-02-281-1/+1
| | | | | | | | | | | | | | This doesn't fix any bug, but makes the code simpler for later patches, and more straightforward to read as is. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '98563953442560dd83aab938f86de3e5a22a891f'Michael Niedermayer2015-03-011-1/+1
|\ \ | |/ | | | | | | | | | | * commit '98563953442560dd83aab938f86de3e5a22a891f': rtpenc_aac: Fix sending fragmented frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_aac: Fix sending fragmented framesMartin Storsjö2015-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't zero, while s->num_frames is zero as intended. Using s->num_frames makes it work as intended, and is less convoluted than keeping track of (resetting) s->buf_ptr. This avoids sending stray data after sending a fragmented aac packet. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'Michael Niedermayer2015-02-281-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919': tls: Pass AVOptions dictionaries through to the chained protocol Conflicts: libavformat/tls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status