summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* libavformat: add support for G726 audio decoder in RTP and RTSP streamsMiroslav Slugeň2011-11-074-0/+104
| | | | | | Fixes Ticket611 Signed-off-by: Michael Niedermayer <[email protected]>
* avio: print a warning from ffurl_alloc() if no protocols are allocated.Michael Niedermayer2011-11-071-0/+5
| | | | | | | Fixes Ticket618 Based on code by teratorn Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-074-5/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) x86inc: use sse versions of common macros instead of sse2 when applicable doc/APIchanges: add missing dates and hashes lavf: don't return from void av_update_cur_dts() Changelog: add more entries. Changelog: update ffmpeg/avconv incompatibility list. avconv: remove some redundant temporary variables. avconv: fix broken indentation avconv: move copy_initial_nonkeyframes to the options context. avconv: use file:stream instead of file.stream in log messages. doc/avconv: elaborate on basic functionality. doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0 Call avformat_network_init/deinit in the programs Remove leftover includes of strings.h avutil: Don't allow using strcasecmp/strncasecmp Replace all usage of strcasecmp/strncasecmp avstring: Add locale independent implementations of strcasecmp/strncasecmp avstring: Add locale independent implementations of toupper/tolower cosmetics: insert some spaces in explicit enum value assignments move 8SVX audio codecs to the audio codec list part on the next bump ... Conflicts: avprobe.c doc/APIchanges ffplay.c ffserver.c libavcodec/avcodec.h libavdevice/bktr.c libavdevice/v4l.c libavdevice/v4l2.c libavformat/matroskaenc.c libavformat/wtv.c libavutil/avstring.c libavutil/avstring.h libavutil/avutil.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: don't return from void av_update_cur_dts()Anton Khirnov2011-11-061-1/+1
| |
| * openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0Martin Storsjö2011-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Since 1.0.0, this function is deprecated. A new function, CRYPTO_THREADID_set_callback is available, but if not set at all, it uses the address of errno as thread id, which should be sufficient for most systems. On windows, it never was necessary to use this function even before 1.0.0, it used the right win32 API function for this by default. Signed-off-by: Martin Storsjö <[email protected]>
| * Remove leftover includes of strings.hMartin Storsjö2011-11-063-3/+0
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * Replace all usage of strcasecmp/strncasecmpReimar Döffinger2011-11-0611-37/+30
| | | | | | | | | | | | | | | | | | | | | | All current usages of it are incompatible with localization. For example strcasecmp("i", "I") != 0 is possible, but would break many of the places where it is used. Instead use our own implementations that always treat the data as ASCII. Signed-off-by: Martin Storsjö <[email protected]>
* | wtvenc: ensure fat tables are padded to the sector boundaryPeter Ross2011-11-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf: remove commented check in compute_pkt_fields2()Stefano Sabatini2011-11-061-3/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-0613-79/+499
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: http: Remove the custom function for disabling chunked posts rtsp: Disable chunked http post through AVOptions movdec: Set frame_size for AMR h264_weight: remove duplication functions. swscale: align vertical filtersize by 2 on x86. libavfilter: reindent. matroskadec: empty blocks are in fact valid. avfilter: don't abort() on zero-size allocations. h264: improve calculation of codec delay. movenc: Set a correct packet size for AMR-NB mode 15, "no data" avformat: Add functions for doing global network initialization avformat: Add the https protocol avformat: Add the tls protocol, using OpenSSL or gnutls avformat: Initialize gnutls in ff_tls_init() w32threads: Wrap the mutex functions in inline functions returning int configure: Allow linking to the gnutls library avformat: Add ff_tls_init()/deinit() that initialize OpenSSL configure: Allow linking to openssl avcodec: Allow locking and unlocking an avformat specific mutex avformat: Split out functions from network.h to a new file, network.c Conflicts: Changelog configure doc/APIchanges libavcodec/internal.h libavcodec/version.h libavfilter/formats.c libavformat/matroskadec.c libavformat/mov.c libavformat/version.h Merged-by: Michael Niedermayer <[email protected]>
| * http: Remove the custom function for disabling chunked postsMartin Storsjö2011-11-052-13/+0
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * rtsp: Disable chunked http post through AVOptionsMartin Storsjö2011-11-051-1/+2
| | | | | | | | | | | | This avoids having to use a private function. Signed-off-by: Martin Storsjö <[email protected]>
| * movdec: Set frame_size for AMRCarl Eugen Hoyos2011-11-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier, sc->samples_per_frame was used for setting the frame size, but all files don't have that set properly. The frame size is a known constant for these codecs. If frame_size isn't set, the mov/3gp muxer refuses to mux it. This fixes stream copy of audio from https://roundup.libav.org/file1248/Video_With_AMR-NB_Audio.3gp to another 3gp file (roundup issue 2468). Signed-off-by: Martin Storsjö <[email protected]>
| * matroskadec: empty blocks are in fact valid.Ronald S. Bultje2011-11-051-2/+3
| |
| * movenc: Set a correct packet size for AMR-NB mode 15, "no data"Carl Eugen Hoyos2011-11-051-1/+1
| | | | | | | | | | | | | | | | | | These packets are valid packets, and consist of 1 byte (which contains the mode bits). This had been analyzed and reported by Igor Levin, igor d levin comverse com. Signed-off-by: Martin Storsjö <[email protected]>
| * avformat: Add functions for doing global network initializationMartin Storsjö2011-11-053-1/+36
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * avformat: Add the https protocolMartin Storsjö2011-11-054-5/+28
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * avformat: Add the tls protocol, using OpenSSL or gnutlsMartin Storsjö2011-11-054-1/+237
| | | | | | | | | | | | | | | | Note, this protocol doesn't yet check verify the server certificate against a local database of trusted CA root certificates. Signed-off-by: Martin Storsjö <[email protected]>
| * avformat: Initialize gnutls in ff_tls_init()Martin Storsjö2011-11-051-0/+20
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
| * avformat: Add ff_tls_init()/deinit() that initialize OpenSSLMartin Storsjö2011-11-052-0/+82
| | | | | | | | | | | | | | If the application hasn't set up mutex callbacks, we set up our own using pthreads (or w32pthreads). Signed-off-by: Martin Storsjö <[email protected]>
| * avformat: Split out functions from network.h to a new file, network.cMartin Storsjö2011-11-053-49/+84
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | wtvdec: ignore another known guidPeter Ross2011-11-061-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | matroskaenc: base default duration on avg_frame_rate if possible.Michael Niedermayer2011-11-061-1/+4
| | | | | | | | | | | | Fixed Ticket432 Signed-off-by: Michael Niedermayer <[email protected]>
* | wtvenc: use ff_put_guid and remove local copy of this functionPeter Ross2011-11-052-18/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | asfenc: rename put_guid to ff_put_guidPeter Ross2011-11-052-14/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | wtvenc: add @file commentPeter Ross2011-11-051-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | fix whitespace nitsPeter Ross2011-11-051-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Replace remaining av_new_stream() with avformat_new_stream().Clément Bœsch2011-11-058-10/+12
| |
* | lavf: fix null pointer dereference in rdtMichael Niedermayer2011-11-031-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | id3v2enc: av_strcasecmp()Michael Niedermayer2011-11-031-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Set frame_size for AMR_NB in mov.Carl Eugen Hoyos2011-11-031-2/+5
| | | | | | | | This copies the behaviour of the amr demuxer.
* | Do not use strcpy for "strings" starting with \0.Carl Eugen Hoyos2011-11-031-1/+1
| |
* | Replace all strcasecmp/strncasecmp usages.Reimar Döffinger2011-11-0311-39/+32
| | | | | | | | | | | | | | | | | | | | All current usages of it are incompatible with localization. For example strcasecmp("i", "I") != 0 is possible, but would break many of the places where it is used. Instead use our own implementations that always treat the data as ASCII. Signed-off-by: Reimar Döffinger <[email protected]>
* | lavf: Do not set cur_dts to undetermined before first_dts has been ↵Michael Niedermayer2011-11-031-1/+2
| | | | | | | | | | | | calculated as this would upset the start_time and first_dts calculation. Signed-off-by: Michael Niedermayer <[email protected]>
* | Cosmetics: Reindent after last commit.Carl Eugen Hoyos2011-11-031-12/+12
| |
* | Support new ALAC magic cookie in caf files.Carl Eugen Hoyos2011-11-031-0/+10
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-0320-39/+184
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <[email protected]>
| * gsm demuxer: do not allocate packet twice.Justin Ruggles2011-11-021-3/+0
| | | | | | | | fixes memleak with raw gsm demuxing.
| * flvenc: use first packet delay as global delay.Justin Ruggles2011-11-021-5/+12
| | | | | | | | This keeps the streams sychronized. The packets must be interleaved per-DTS.
| * rtsp: add allowed_media_types optionJohn Brooks2011-11-022-1/+16
| | | | | | | | | | | | | | | | Streams from RTSP or SDP that do not match an allowed type will be skipped entirely, which allows video-only or audio-only streaming from servers that provide both. Signed-off-by: Martin Storsjö <[email protected]>
| * Create separate functions for the raw GSM demuxer.Justin Ruggles2011-11-023-13/+136
| | | | | | | | | | Put the new raw GSM demuxer in its own file. Fixes raw GSM demuxing.
| * Replace vendor string in Ogg and FLAC muxers.Diego Biurrun2011-11-022-2/+2
| |
| * Replace ffmpeg references with more accurate libav* references.Diego Biurrun2011-11-025-5/+5
| |
| * Replace outdated references to ffmpeg tool with avconv.Diego Biurrun2011-11-024-5/+9
| |
| * Remove some stray unnecessary ffmpeg references.Diego Biurrun2011-11-027-7/+7
| |
| * id3v2: fix type of ID3v2EMFunc.free()Anton Khirnov2011-11-021-2/+3
| |
| * g726: use bits_per_coded_sample instead of bitrate to determine modeJustin Ruggles2011-11-011-7/+10
| | | | | | | | | | | | | | | | | | | | This requires some workarounds in the WAV muxer and demuxer. We need to write the correct bits_per_coded_sample and block_align in the muxer. In the demuxer, we cannot rely on the bits_per_coded_sample value, so we use the bit rate and sample rate to determine the value. This avoids having the decoder rely on AVCodecContext.bit_rate, which is not required to be set by the user for decoding according to our API.
* | mpegtsenc: EAC3 supportMean2011-11-021-0/+6
| | | | | | | | | | Reviewed-by: Baptiste Coudurier <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | id3v2enc: include strings.h for strcasecmp()Michael Niedermayer2011-11-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | id3v2enc: add support for year and day/month tags when writing id3v2 version ↵Tobias Rapp2011-11-021-1/+42
| | | | | | | | | | | | | | | | | | | | 3 metadata Adds support for year (TYER) and day/month (TDAT) tags when writing id3v2 version 3 metadata by splitting the "date" tag. The date tag should have a format of "YYYY-MM-DD" or "YYYY". Signed-off-by: Michael Niedermayer <[email protected]>