summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'Michael Niedermayer2014-06-101-1/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd': mpegts: Provide an option to override the pcr period Conflicts: doc/muxers.texi libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: Provide an option to override the pcr periodLuca Barbato2014-06-101-1/+4
| | | | | | | | Certain hardware demuxer have specific restrictions for PCR periodicity.
* | Merge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'Michael Niedermayer2014-06-101-44/+44
|\| | | | | | | | | | | | | | | | | | | * commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac': mpegts: Move the option section to the bottom Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: Move the option section to the bottomLuca Barbato2014-06-101-35/+35
| | | | | | | | | | Makes it consistent with the rest of the formats and ease usage of macros constants for the defaults.
| * oggenc: Set the right AVOption size for the pref_duration optionMartin Storsjö2014-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On big endian machines, the default value set via the faulty AVOption ended up as 2^32 times too big. This fixes the fate-lavf-ogg test which currently is broken on big endian machines, broken since 3831362. Since that commit, a final zero-sized packet is written to the ogg muxer in that test, which caused different flushing behaviour on little and big endian depending on whether the pref_duration option was handled as it should or not. CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-06-104-9/+18
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Allow values >31bit for -analyzeduration. Merged-by: Michael Niedermayer <[email protected]>
| * | Allow values >31bit for -analyzeduration.Carl Eugen Hoyos2014-06-104-9/+18
| | |
* | | avformat/nutenc: cleaner version checkMichael Niedermayer2014-06-101-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | | avformat/nutenc: Fix error handling in nut_write_packet()Michael Niedermayer2014-06-101-10/+17
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | | avformat/rawdec: Increase probe score when "Content-Type: image/jpeg" is ↵Michael Niedermayer2014-06-101-3/+11
| | | | | | | | | | | | | | | | | | | | | found at the file start Based-on code by: Carl Eugen Hoyos and Andrey Utkin Signed-off-by: Michael Niedermayer <[email protected]>
* | | avformat/utils: dont wait for a first dts on demuxers which have ↵Michael Niedermayer2014-06-101-0/+1
| | | | | | | | | | | | | | | | | | AVFMT_NOTIMESTAMPS set Signed-off-by: Michael Niedermayer <[email protected]>
* | | avformat/rawdec: mark raw vc1 and mjpeg as having no timestampsMichael Niedermayer2014-06-101-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | | avformat/rawdec: add FF_DEF_RAWVIDEO_DEMUXER2, which allows specifying the flagsMichael Niedermayer2014-06-101-2/+5
|/ / | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/nutenc: Fix error handling in write_sm_data()Michael Niedermayer2014-06-101-5/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown.Carl Eugen Hoyos2014-06-091-1/+3
| |
* | avformat: add mjpeg_probe()Michael Niedermayer2014-06-091-1/+59
| | | | | | | | | | | | Fixes Ticket3679 Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/cavsvideodec: Fix probing when the file extension is avsMichael Niedermayer2014-06-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/movenc: use av_malloc(z)_array()Michael Niedermayer2014-06-081-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/udp: fix build on MINIXMichael Niedermayer2014-06-071-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial ↵Michael Niedermayer2014-06-071-0/+12
| | | | | | | | | | | | | | format extensions being enabled. Found-by: Jean-Baptiste Kempf <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf/matroskaenc: Fix Cues on Audio for WebM DASHVignesh Venkatasubramanian2014-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix a change that was broken by [1]. Cues must be added for audio frames on cluster start for WebM when the DASH flag is passed. Restoring correct functionality. [1] http://goo.gl/xYLq7Z Signed-off-by: Vignesh Venkatasubramanian <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mov: fix "warning: variable altitude set but not used" warningMichael Niedermayer2014-06-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-06-062-2/+2
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Allow >2G for skip_initial_bytes. Merged-by: Michael Niedermayer <[email protected]>
| * | Allow >2G for skip_initial_bytes.Carl Eugen Hoyos2014-06-062-2/+2
| | |
* | | Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'Michael Niedermayer2014-06-061-0/+40
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c': mov: Export geotag metadata fields Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <[email protected]>
| * mov: Export geotag metadata fieldsMartin Storsjö2014-06-061-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | The '?xyz' form is used by android devices (and according to apple mailing list archives, also by older iOS devices). The 'loci' field (defined in 3GPP 26.244) is used by recent iOS devices. Even though the loci field can contain an altitude, it was plain 0 in my sample. Just export longitude and latitude, in a string format matching the one used by the '?xyz' metadata field. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'Michael Niedermayer2014-06-042-3/+20
|\| | | | | | | | | | | | | | | | | | | * commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7': oggenc: Support flushing the muxer Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <[email protected]>
| * oggenc: Support flushing the muxerMartin Storsjö2014-06-042-3/+20
| | | | | | | | | | | | | | | | | | This allows the caller to write all buffered data to disk, allowing the caller to know at what byte position in the file a certain packet starts (any packet written after the flush will be located after that byte position). Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/avidec: allow rounding errors between scale/rate and timebaseMichael Niedermayer2014-06-041-2/+1
| | | | | | | | | | | | Fixes Ticket3670 Signed-off-by: Michael Niedermayer <[email protected]>
* | fix various typosLou Logan2014-06-035-5/+5
| | | | | | | | | | Signed-off-by: Lou Logan <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/asfdec: Use a parser for mpeg4-asp to find has_b_framesMichael Niedermayer2014-06-031-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Do not limit blocksize when reading PCM from aiff.Carl Eugen Hoyos2014-06-031-2/+8
| | | | | | | | Fixes ticket #3695.
* | avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup ↵Michael Niedermayer2014-06-021-8/+8
| | | | | | | | | | | | out of the packet loop Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/utils: Call ff_rfps_add_frame() only for videoMichael Niedermayer2014-06-021-1/+2
| | | | | | | | | | | | This avoids some unneeded computations Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mux: Dont leave stale side data pointers in ff_interleave_add_packet()Michael Niedermayer2014-06-021-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mux: fix memleak of side data in flac fate testsMichael Niedermayer2014-06-021-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Report "unknown codec" instead of "unspecifed size" if the codec is unknown.Carl Eugen Hoyos2014-06-021-2/+3
| |
* | Merge commit '59cb5747ec3c5cd842b94e574c37889521c97cc4'Michael Niedermayer2014-06-021-1/+65
|\| | | | | | | | | | | | | * commit '59cb5747ec3c5cd842b94e574c37889521c97cc4': rtmpproto: read metadata to set correct FLV header Merged-by: Michael Niedermayer <[email protected]>
| * rtmpproto: read metadata to set correct FLV headerUwe L. Korn2014-06-011-1/+65
| | | | | | | | | | | | | | | | In the presence of no metadata, do not set any stream flag in the FLV header but let the demuxer handle the detection and creation of streams as data arrives. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c'Michael Niedermayer2014-06-012-4/+27
|\| | | | | | | | | | | | | * commit '3b18857ab301d2a0b3e86e9d85eed76f0798a29c': rtmppkt: Add method to read an AMF string that is not prefixed by its type Merged-by: Michael Niedermayer <[email protected]>
| * rtmppkt: Add method to read an AMF string that is not prefixed by its typeUwe L. Korn2014-06-012-4/+27
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'Michael Niedermayer2014-06-011-8/+0
|\| | | | | | | | | | | | | * commit 'a1859032e39d96352687186fd179e1559dea2aca': flvdec: Do not default to a video and audio stream Merged-by: Michael Niedermayer <[email protected]>
| * flvdec: Do not default to a video and audio streamUwe L. Korn2014-06-011-8/+0
| | | | | | | | | | | | | | | | | | If no streams were indicated in the FLV header, do not automatically allocate by default a video and an audio stream. Instead, in the case that the header did not indicate the presence of any data, allocate no stream until data actually arrives for one type. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'Michael Niedermayer2014-06-014-15/+37
|\| | | | | | | | | | | | | | | | | | | * commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52': flac muxer: support reading updated extradata from side data Conflicts: libavformat/flacenc.c Merged-by: Michael Niedermayer <[email protected]>
| * flac muxer: support reading updated extradata from side dataAnton Khirnov2014-06-014-15/+37
| |
* | Merge commit '0097cbea695e534fce39958ccd103af2fbf65831'Michael Niedermayer2014-06-011-6/+5
|\| | | | | | | | | | | | | * commit '0097cbea695e534fce39958ccd103af2fbf65831': flac muxer: accept only STREAMINFO extradata Merged-by: Michael Niedermayer <[email protected]>
| * flac muxer: accept only STREAMINFO extradataAnton Khirnov2014-06-011-6/+5
| | | | | | | | | | | | | | | | The other format (full flac header blocks) should not be exported by any demuxers anymore. This allows to drop an avpriv_ function and also simplify the following commits.
* | Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'Michael Niedermayer2014-06-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d': matroskaenc: Allow VP9 and Opus in webm Conflicts: libavformat/matroskaenc.c See: 820ffaed0f64b7ec27275d093c6f81e181c86e94 Merged-by: Michael Niedermayer <[email protected]>
| * matroskaenc: Allow VP9 and Opus in webmTudor Suciu2014-06-011-1/+3
| | | | | | | | | | | | Bug-Id: 695 Signed-off-by: Anton Khirnov <[email protected]>
* | Read mov files where the moov atom is hidden within a free atom.Carl Eugen Hoyos2014-05-312-0/+18
| | | | | | | | Fixes ticket #1551 / issue 2226.