summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
| * movenc: Write correct presentation timestamps in tfraMartin Storsjö2014-11-07
| | | | | | | | | | | | | | Previously we wrote decoding timestamps here, while the specs say it should be presentation timestamps. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b'Michael Niedermayer2014-11-08
|\| | | | | | | | | | | | | * commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b': movenc: Remove a now redundant check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Remove a now redundant checkMartin Storsjö2014-11-07
| | | | | | | | | | | | | | | | | | | | When using the new first_trun flag instead of checking the track id, we don't need to have a special case for the separate_moof flag any longer. This simplifies the complicated codepath ever so slightly. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8'Michael Niedermayer2014-11-08
|\| | | | | | | | | | | | | | | | | | | | | * commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8': movenc: Allow to request not to use edit lists Conflicts: libavformat/movenc.c See: 537ef8bebf8a35aab448db6ec876e275a10f0f15 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow to request not to use edit listsMartin Storsjö2014-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case, shift tracks to start from zero instead (potentially stretching the first sample in tracks that start later than the first one). Some software does not support edit lists at all, the adobe flash player seems to be one of these. This results in AV sync errors when edit lists are used to adjust AV sync. Some players, such as QuickTime, don't respect the duration for audio packets, so if an audio track starts later than the video track and the first audio sample gets a duration longer than the actual amount of data in it, the result will be out of sync. Based on patches by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'Michael Niedermayer2014-11-07
|\| | | | | | | | | | | | | | | | | | | | | * commit '897d5c3a4296f3da80b8699d1487328ca2de8e55': lavf: Print a warning if failed to avoid negative timestamps when requested Conflicts: libavformat/mux.c See: ec6a5fc6cca22e4eb0a91cc8fba786d41ade2032 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Print a warning if failed to avoid negative timestamps when requestedMichael Niedermayer2014-11-07
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1384df641994bf3d6cb51084290aa94752737bae'Michael Niedermayer2014-11-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1384df641994bf3d6cb51084290aa94752737bae': lavf: Add an option for avoiding negative timestamps Conflicts: libavformat/avformat.h libavformat/mux.c libavformat/options_table.h libavformat/version.h See: 3ba0dab76ac32f0c9f50c916a73bc64e43c1fdf9 See: a89c01253190b9eb9de8e28a3252423bf7732511 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add an option for avoiding negative timestampsMichael Niedermayer2014-11-07
| | | | | | | | | | | | | | | | | | | | | | This is the same logic as is invoked on AVFMT_TS_NEGATIVE, but which can be enabled manually, or can be enabled in muxers which only need it in certain conditions. Also allow using the same mechanism to force streams to start at 0. Signed-off-by: Martin Storsjö <martin@martin.st>
| * nutdec: do not set has_b_framesAnton Khirnov2014-11-06
| | | | | | | | It is not supposed to be set by demuxers.
* | avformat/webpenc: preserve single image VP8X flagsMichael Niedermayer2014-11-07
| | | | | | | | | | | | Fixes Ticket4087 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/riffenc: move MP3 LSF threshold to the midway point between the 2Michael Niedermayer2014-11-06
| | | | | | | | | | | | No testcase available but this seems more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/yuv4mpegenc: Use AVFormatContext strict_std_compliance instead of ↵Michael Niedermayer2014-11-06
| | | | | | | | | | | | AVCodecContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mmf: Use AVFormatContext strict_std_compliance instead of ↵Michael Niedermayer2014-11-06
| | | | | | | | | | | | AVCodecContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flvenc: Use AVFormatContext strict_std_compliance instead of ↵Michael Niedermayer2014-11-06
| | | | | | | | | | | | AVCodecContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e839de0f851535b5e19256b52f9865f0cb768a7c'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | * commit 'e839de0f851535b5e19256b52f9865f0cb768a7c': oggenc: accept only STREAMINFO extradata Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggenc: accept only STREAMINFO extradataAnton Khirnov2014-11-06
| | | | | | | | | | The reasoning is the same as for 0097cbea695e534fce39958ccd103af2fbf65831.
* | Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | | | | | | | * commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c': lavf: stop using avpriv_flac_parse_streaminfo() Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: stop using avpriv_flac_parse_streaminfo()Anton Khirnov2014-11-06
| | | | | | | | | | | | The only parameters needed by the demuxers are the sample rate and sample count, which can be trivially extracted manually, without resorting to an avpriv function.
* | Merge commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | * commit '56dc46a1893251e74be1ad63e54fb38d754bb1fe': riffenc: do not fall back on AVCodecContext.frame_size for MP3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riffenc: do not fall back on AVCodecContext.frame_size for MP3Anton Khirnov2014-11-06
| | | | | | | | | | | | | | It will not be set unless the codec context is used as the encoding context, which is discouraged. For MP2, av_get_audio_frame_duration() will already set the frame size properly. For MP3, set the frame size explicitly.
* | Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | | | | | | | * commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e': lavf: use the format context strict_std_compliance instead of the codec one Conflicts: libavformat/mux.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use the format context strict_std_compliance instead of the codec oneAnton Khirnov2014-11-06
| |
* | avformat/oggparsevorbis: Check that initialization succeeded before ↵Michael Niedermayer2014-11-06
| | | | | | | | | | | | declaring the end of headers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggparsevorbis: return proper error code from vorbis_header()Michael Niedermayer2014-11-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | | | | | | | * commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959': lavc,lavf: switch to the new vorbis parse API Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc,lavf: switch to the new vorbis parse APIAnton Khirnov2014-11-06
| |
* | Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70': lavc: add a public API for parsing vorbis packets. Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/version.h libavcodec/vorbis_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add a public API for parsing vorbis packets.Anton Khirnov2014-11-06
| | | | | | | | | | | | It is required by (at least) the ogg demuxer. Mark the current semi-public apriv API for removal.
* | Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'Michael Niedermayer2014-11-06
|\| | | | | | | | | | | | | | | | | | | * commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67': vorbis_parser: add an AV prefix to VorbisParseContext Conflicts: libavcodec/vorbis_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis_parser: add an AV prefix to VorbisParseContextAnton Khirnov2014-11-06
| | | | | | | | This is done in preparation for making it public.
* | avformat/udp: UDP-Lite (RFC 3828) support addedThomas Volkert2014-11-05
| | | | | | | | | | | | (This fixes ticket #1501) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404'Michael Niedermayer2014-11-05
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a490391157dcf4dc6b65352ec3eea2781dd0a404': rtmpproto: Ignore errors from the getStreamLength method Conflicts: libavformat/rtmpproto.c See: 09711545f5d256bd3ac77004d123dae36c5db8f9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Ignore errors from the getStreamLength methodMartin Storsjö2014-11-05
| | | | | | | | | | | | | | | | | | | | It is never an error if this method failed. If rt->live was explicitly set to 0 (known to be a recorded file), print it as a warning, otherwise print it as a debug message. Based on a patch by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mpegts: fix iteration count in add_pid_to_pmt()Michael Niedermayer2014-11-04
| | | | | | | | | | | | Fixes accessing uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | id3v2: prefer TDRC for date over TDRL.Benoit Fouet2014-11-04
| | | | | | | | | | | | | | | | | | | | | | | | | | TDRL is what we used as a replacement of TYER, and, according to http://id3.org/id3v2.4.0-changes : TYER - Year This frame is replaced by the TDRC frame, 'Recording time' [F:4.2.5]. So change TDRL usages to TDRC. Fixes ticket #3694 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: also print PMT version in av_dlog()Michael Niedermayer2014-11-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtmpproto: Do not fail when the length cannot be determined for ↵Michael Niedermayer2014-11-04
| | | | | | | | | | | | | | | | live streams Fixes Ticket4071 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Continue parsing PMTs during duration estimationMichael Niedermayer2014-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | This way if we by chance run into a valid PMT we have a more complete set of streams, also do not reset streams in case we run into a worse PMT Fixes Ticket4046 alternatively Ticket4046 could be closed as invalid or wontfix as it contains some PMTs which lack the 2 subtitle streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Leave skip_clear enabled until after estimate_timings()Michael Niedermayer2014-11-03
| | | | | | | | | | | | Should make no difference but will be needed for subsequent commits Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Do not add pid if its already there with add_pid_to_pmt()Michael Niedermayer2014-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2f221b6a9365aa400061e16266f2d1242f7169f8'Michael Niedermayer2014-11-03
|\| | | | | | | | | | | | | * commit '2f221b6a9365aa400061e16266f2d1242f7169f8': movenc: Define the flag bits using shifts instead of as decimal numbers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Define the flag bits using shifts instead of as decimal numbersMartin Storsjö2014-11-03
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/flvenc: fail in case the muxed packet is too bigStefano Sabatini2014-11-03
| | | | | | | | | | | | Avoid the creation of files which cannot be successfully decoded by ffmpeg, for example generated with: ffmpeg -f lavfi -i sine -af "aselect='not(between(t,100,500))',aresample=min_comp=0.001:min_hard_comp=0.100000" -acodec pcm_s16le -t 1000 -y out_audio.flv
* | lavf/movenc: Write G.726 bitrate to make the files decodable.Carl Eugen Hoyos2014-11-03
| | | | | | | | Fixes ticket #4069.
* | avformat/img2enc: Use localtime_r() for thread safteyMichael Niedermayer2014-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/sbgdec: Use localtime_r() for thread safteyMichael Niedermayer2014-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavenc: Use localtime_r() for thread safteyMichael Niedermayer2014-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: use time_internal.h, simplify codeMichael Niedermayer2014-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: use gmtime_r() for thread safteyMichael Niedermayer2014-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>