summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* lavf/ftp: properly read an empty pathMariusz Szczepańczyk2015-08-101-10/+8
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* lavf/ftp: implement directory listing callbacksLukasz Marek2015-08-101-11/+182
| | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com> Signed-off-by: Michael Niedermayer <[email protected]>
* Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc'Hendrik Leppkes2015-08-101-0/+3
|\ | | | | | | | | | | | | * commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc': movenc: Place the sidx index after the initial moov/mdat pair Merged-by: Hendrik Leppkes <[email protected]>
| * movenc: Place the sidx index after the initial moov/mdat pairMartin Storsjö2015-08-101-0/+3
| | | | | | | | | | | | | | | | | | | | For fragmented files with non-empty moov, with a fragment index (sidx), place the index after the initial moov/mdat pair. Previously, for this pathological case, the index was written at the start of the file. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '83f254e65f938657a4dbec711e4c94252a72daf9'Hendrik Leppkes2015-08-102-11/+11
|\| | | | | | | | | | | | | | | | | | | | | * commit '83f254e65f938657a4dbec711e4c94252a72daf9': movenc: Rename reserved_moov_pos to reserved_header_pos Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Hendrik Leppkes <[email protected]>
| * movenc: Rename reserved_moov_pos to reserved_header_posMartin Storsjö2015-08-102-8/+8
| | | | | | | | | | | | | | The same field is also used for writing the sidx index header, for fragmented files, when the faststart flag is used. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '8e34089e265a6b01e1e3301e8864439d26793753'Hendrik Leppkes2015-08-101-0/+2
|\| | | | | | | | | | | | | * commit '8e34089e265a6b01e1e3301e8864439d26793753': movenc: Check that frag_info entries exist in mov_write_sidx_tag Merged-by: Hendrik Leppkes <[email protected]>
| * movenc: Check that frag_info entries exist in mov_write_sidx_tagMartin Storsjö2015-08-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes crashes with pathological cases when trying to write a sidx index (via the -movflags faststart option, in combination with fragmenting options), when no fragments actually have been written. (This is possible if the empty_moov flag isn't used, so that all actual packet data is written in the moov/mdat pair, and no moof/mdat pairs have been written.) In these pathological cases, no sidx should be written at all. Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/gifdec: correct r_frame_rate for single frame gifsMichael Niedermayer2015-08-101-0/+9
| | | | | | | | | | | | Fixes Ticket4650 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a'Hendrik Leppkes2015-08-071-1/+1
|\| | | | | | | | | | | | | * commit 'e5997152f54f790229c99f237f8eb6b5b1ee683a': asf: Use time_t where needed Merged-by: Hendrik Leppkes <[email protected]>
| * asf: Use time_t where neededLuca Barbato2015-08-041-1/+1
| | | | | | | | gmtime takes a time_t not an uint64_t.
* | Merge commit '944f60866f507e3c0850ae9c2f30dac1da54587c'Hendrik Leppkes2015-08-071-16/+36
|\| | | | | | | | | | | | | * commit '944f60866f507e3c0850ae9c2f30dac1da54587c': asfdec: read values properly Merged-by: Hendrik Leppkes <[email protected]>
| * asfdec: read values properlyAlexandra Hájková2015-08-041-16/+36
| | | | | | | | | | | | | | The length of BOOL values is 16 bits in the Metadata Object but 32 bits in the Extended Content Description Object. Signed-off-by: Luca Barbato <[email protected]>
* | avformat/matroskaenc: Avoid "for (int i" syntax for better compatibilityMichael Niedermayer2015-08-061-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | libavformat/matroska: Write stream durations in metadata, in the format of ↵Sasi Inguva2015-08-051-5/+74
| | | | | | | | | | | | | | | | | | mkvmerge. Compute individual stream durations in matroska muxer. Write them as string tags in the same format as mkvmerge tool does. Signed-off-by: Sasi Inguva <[email protected]>
* | lavf/swf: Fix auto-detection of compressed files.Carl Eugen Hoyos2015-08-041-0/+4
| | | | | | | | | | | | Fixes auto-detection of compressed swf files as in http://samples.ffmpeg.org/SWF/compressed-swf/ Reported by forum user Zard1096.
* | lavf/mxfdec: support segmented frame layout as separate fields layoutMatthieu Bouron2015-08-041-4/+2
| | | | | | | | | | | | | | | | | | According to S377M, segmented frame layout is identical to separate field layout except that the two fields are taken from a single scan of the incoming image, ie: they are coincident in time. Thus the resulting frame is progressive. Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e'Hendrik Leppkes2015-08-021-10/+12
|\| | | | | | | | | | | | | * commit 'fdbc544d29176ba69d67dd879df4696f0a19052e': asfdec: prevent the memory leak while reading metadata Merged-by: Hendrik Leppkes <[email protected]>
| * asfdec: prevent the memory leak while reading metadataAlexandra Hájková2015-08-021-10/+12
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'Hendrik Leppkes2015-08-021-3/+0
|\| | | | | | | | | | | | | * commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672': asfdec: remove improper assignement that caused wrong timestamps Merged-by: Hendrik Leppkes <[email protected]>
| * asfdec: remove improper assignement that caused wrong timestampsAlexandra Hájková2015-07-311-3/+0
| | | | | | | | | | | | | | | | and remove unneeded variable Sample-Id: https://samples.libav.org/asf-wmv/asf-code-53/movn018.asf Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961'Hendrik Leppkes2015-08-021-2/+4
|\| | | | | | | | | | | | | * commit '78491fe8cfed83d2aead95dafe26f0d3f999e961': asfdec: do not export empty metadata Merged-by: Hendrik Leppkes <[email protected]>
| * asfdec: do not export empty metadataAlexandra Hájková2015-07-311-2/+4
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'cd4d9df22738e6f147521ccb72c7930db6050914'Hendrik Leppkes2015-08-021-3/+5
|\| | | | | | | | | | | | | * commit 'cd4d9df22738e6f147521ccb72c7930db6050914': asfdec: free AVDictionaries properly when closing the demuxer Merged-by: Hendrik Leppkes <[email protected]>
| * asfdec: free AVDictionaries properly when closing the demuxerAlexandra Hájková2015-07-311-3/+5
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | avformat/mov: fix regression in processing .aax filesVesselin Bontchev2015-08-021-3/+3
| | | | | | | | | | | | | | | | | | Commit 0a551cbe introduced "activation_bytes" option, and not specifying this option (while calling ffmpeg / ffprobe) causes the program to quit early. Before this commit, ffprobe was capable of processing metadata in .aax files. Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/http: Implement server side network code.Stephan Holljes2015-08-011-24/+158
| | | | | | | | | | | | | | | | add http_accept, add http_handshake and move handshake logic there, handle connection closing. Signed-off-by: Stephan Holljes <[email protected]>
* | lavf/tcp: increase range for listen and call the underlying socket ↵Stephan Holljes2015-08-011-5/+10
| | | | | | | | | | | | operations accordingly Signed-off-by: Stephan Holljes <[email protected]>
* | lavf/tcp: add tcp_acceptStephan Holljes2015-08-011-0/+18
| | | | | | | | Signed-off-by: Stephan Holljes <[email protected]>
* | lavf/avio: add avio_accept and avio_handshakeStephan Holljes2015-08-012-0/+46
| | | | | | | | Signed-off-by: Stephan Holljes <[email protected]>
* | lavf/avio: add ffurl_accept and ffurl_handshakeStephan Holljes2015-08-012-0/+45
| | | | | | | | Signed-off-by: Stephan Holljes <[email protected]>
* | lavf/network: split ff_listen_bind into ff_listen and ff_acceptStephan Holljes2015-08-012-6/+41
| | | | | | | | Signed-off-by: Stephan Holljes <[email protected]>
* | avformat/wavdec: add extra sample count check for G.729 filesGanesh Ajjanagadde2015-07-311-0/+7
| | | | | | | | | | | | | | Can be used to fix Ticket4577 Signed-off-by: Ganesh Ajjanagadde <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '764ec70149728be82304c163ccc4e280f1629201'Michael Niedermayer2015-07-301-2/+3
|\| | | | | | | | | | | | | * commit '764ec70149728be82304c163ccc4e280f1629201': rtsp: Only interpret $ as interleaved packet indicator at the start of replies Merged-by: Michael Niedermayer <[email protected]>
| * rtsp: Only interpret $ as interleaved packet indicator at the start of repliesMartin Storsjö2015-07-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Allow $ as character anywhere within normal RTSP replies - both within the lines, and as the first character of RTSP header lines. (The existing old comment indicated that an inline packet could start at any line within a RTSP reply header, but that doesn't sound valid to me, and I'm not sure if the existing code handled that correctly either.) CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'Michael Niedermayer2015-07-301-8/+89
|\| | | | | | | | | | | | | | | | | | | * commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744': hls: Save and forward avio options Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <[email protected]>
| * hls: Save and forward avio optionsLuca Barbato2015-07-301-13/+80
| | | | | | | | | | | | Make possible to send the custom headers and override the user agent. Reported-by: BenWonder
* | Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf'Michael Niedermayer2015-07-301-1/+8
|\| | | | | | | | | | | | | * commit '5ae178539b91d25710b7bb322d156c31aea9f8bf': http: Add the trailing endlines if they are missing Merged-by: Michael Niedermayer <[email protected]>
| * http: Add the trailing endlines if they are missingLuca Barbato2015-07-301-1/+8
| | | | | | | | | | Makes slightly easier the life of those want to use the option from the command line
| * rtmpproto: free hmac context properlyJames Almer2015-07-301-1/+1
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
| * rtmpproto: use AVHMAC instead of a custom implementationJames Almer2015-07-292-32/+10
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/rtmpproto: free hmac context properlyJames Almer2015-07-291-1/+1
| | | | | | | | Signed-off-by: James Almer <[email protected]>
* | rawdec: fix mjpeg probing buffer size checkwm42015-07-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | rawdec: fix mjpeg probingwm42015-07-291-1/+1
| | | | | | | | | | | | | | | | There can be other headers than "Content-Type:" (in this case, a "Content-Length:" header was following), so checking for a trailing newline is wrong. Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/oggdec: ogg_read_seek: reset ogg after seekingMichael Niedermayer2015-07-291-0/+1
| | | | | | | | | | | | Fixes Ticket4743 Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/rtmpproto: use AVHMAC instead of a custom implementationJames Almer2015-07-292-32/+10
| | | | | | | | | | Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: James Almer <[email protected]>
* | avformat/wavdec: Check for data_size overflowMichael Niedermayer2015-07-291-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | wavdec: make sample count check more preciseGanesh Ajjanagadde2015-07-291-1/+1
| | | | | | | | | | | | | | May be used to fix Ticket4577 Signed-off-by: Ganesh Ajjanagadde <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'Michael Niedermayer2015-07-281-2/+2
|\| | | | | | | | | | | | | * commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf': asfdec: do not align Data Object when Broadcast Flag is set Merged-by: Michael Niedermayer <[email protected]>
| * asfdec: do not align Data Object when Broadcast Flag is setAlexandra Hájková2015-07-271-2/+2
| | | | | | | | | | | | its size is invalid in this case Signed-off-by: Anton Khirnov <[email protected]>