summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2012-12-21
| |
* | Merge commit 'a925f723a915bc0255e2673f8817af5212131763'Michael Niedermayer2012-12-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a925f723a915bc0255e2673f8817af5212131763': rtp: Don't read priv_data unless it is allocated flvenc: Check whether seeking back to the header succeeded sapenc: Pass the title on to the chained muxers Conflicts: libavformat/flvenc.c libavformat/sapenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: Don't read priv_data unless it is allocatedMartin Storsjö2012-12-20
| | | | | | | | | | | | | | This makes all users of rtpenc_chain (rtsp muxer, sapenc, mov rtp hinting) work again, broken since 8034130e0. Signed-off-by: Martin Storsjö <martin@martin.st>
| * flvenc: Check whether seeking back to the header succeededBjörn Axelsson2012-12-20
| | | | | | | | | | | | | | | | The FLV muxer tries to update the header in write_trailer, which is impossible if writing to a pipe or network stream. Don't write header data if seeking to the header fails. Signed-off-by: Martin Storsjö <martin@martin.st>
| * sapenc: Pass the title on to the chained muxersJernej Virag2012-12-20
| | | | | | | | | | | | | | This makes sure it ends up in the SDP, providing a proper session name in the SAP announcements. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf: Remove "Adjusting PTS forward" codeMichael Niedermayer2012-12-21
| | | | | | | | | | | | | | it causes problems (incorrectly detect TS discontinuities) with a brokan TS file (test-audio-broken.ts) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation with --disable-everything --enable-muxer=mov.Carl Eugen Hoyos2012-12-21
| |
* | lavf/hlsenc: provide some feedback in case of invalid basenameStefano Sabatini2012-12-21
| |
* | lavf/hlsenc: fix minor grammar inconsistencies in the option help messagesStefano Sabatini2012-12-21
| |
* | lavf/srtdec: reindent after previous commits.Clément Bœsch2012-12-20
| |
* | lavf/srtenc: honor subtitle position side data.Clément Bœsch2012-12-20
| |
* | lavf/srtdec: switch to FFDemuxSubtitlesQueue API.Clément Bœsch2012-12-20
| |
* | lavf: split packets before muxing.Clément Bœsch2012-12-20
| | | | | | | | | | | | | | | | After demuxing, data and side are merged. Before decoding, they are split. Encoder will perform with data and side split. This means that a muxer can receive split data (after encoding) but also merged data (if called directly after demuxing). This commit makes sure data and side are split for the muxer.
* | aiffenc: set correct number of bits foru8 in aiffPiotr Bandurski2012-12-20
| | | | | | | | | | | | with this change QuickTime is able to play u8 aiff file generated by FFmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer2012-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011': cmdutils: pass number of groups to split_commandline(). mov: handle h263 and flv1 for codec_tag 'H','2','6','3' h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles Conflicts: libavcodec/h264_ps.c libavformat/isom.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: handle h263 and flv1 for codec_tag 'H','2','6','3'Janne Grunau2012-12-19
| | | | | | | | | | | | | | | | | | | | The sample in https://bugzilla.libav.org/show_bug.cgi?id=393 and samples/F4V/H263_NM_f.mp4 both have codec_tag H263 for different codecs. H263 is apparently used by Flash Media Server for Sorensen Spark videos. Patch based on commit 5442083b1c541dd166b3adf39131259fc846a62b by Carl Eugen Hoyos. Fixes bug 393.
* | astenc: Remove two AVRationals with denominator 1James Almer2012-12-20
| | | | | | | | | | | | | | | | They are completely superfluous when using av_rescale_q_rnd(). Call av_rescale_rnd() using what used to be the numerators instead. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | au: return meaningful error codesPaul B Mahol2012-12-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pvfdec: drop pointless casting of buffer in ff_get_line()Paul B Mahol2012-12-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'Michael Niedermayer2012-12-19
|\| | | | | | | | | | | | | | | | | | | | | * commit '523c7bd23c781aa0f3a85044896f5e18e8b52534': misc typo, style and wording fixes Conflicts: libavcodec/options_table.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * misc typo, style and wording fixesDiego Biurrun2012-12-18
| |
| * doxy: Clarify what avpriv_set_pts_info doesDerek Buitenhuis2012-12-17
| | | | | | | | | | | | The "pts for a given stream" was nonsensical. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | utils: fix duration calculation for strange_duration_example.tsMichael Niedermayer2012-12-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Cosmetics: Reindent after last commit.Carl Eugen Hoyos2012-12-18
| |
* | Do not skip three bytes and don't search for extradata in old realaudio files.Carl Eugen Hoyos2012-12-18
| | | | | | | | Fixes ticket #1557.
* | Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'Michael Niedermayer2012-12-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a': au: Reorder code so that both muxer and demuxer are under #ifdefs fate: Move RALF test into lossless audio group cosmetics: Use consistent names for multiple inclusion guards. Conflicts: libavformat/au.c tests/fate/lossless-audio.mak tests/fate/real.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * au: Reorder code so that both muxer and demuxer are under #ifdefsDiego Biurrun2012-12-17
| | | | | | | | This reduces code size when either piece has been disabled.
| * cosmetics: Use consistent names for multiple inclusion guards.Diego Biurrun2012-12-17
| |
* | wtv: permit root table and first sectors to be located beyond 2GB boundaryPeter Ross2012-12-19
| | | | | | | | | | | | Fixes ticket #2025. Signed-off-by: Peter Ross <pross@xvid.org>
* | nutdec: sanity check r_frame_rateMichael Niedermayer2012-12-18
| | | | | | | | | | | | This fixes files that store a somewhat incorrect value. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix "bistream" typo and add a check in tools/patcheck.Clément Bœsch2012-12-18
| |
* | oggparsevorbis: check channelsMichael Niedermayer2012-12-17
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | SAP muxer set session name from metadataJernej Virag2012-12-17
| | | | | | | | | | | | | | | | Pass "title" metadata field to av_sdp_create (as in RTP muxer) in SAP muxer for correct session name in SAP SDP announcements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | concatdec: change data type to suppress warning about limited range of data ↵Michael Niedermayer2012-12-17
| | | | | | | | | | | | | | type on some platforms. Reviewed-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doxy: Clarify what avpriv_set_pts_info doesDerek Buitenhuis2012-12-17
| | | | | | | | | | | | The "pts for a given stream" was nonsensical. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'Michael Niedermayer2012-12-17
|\| | | | | | | | | | | | | | | | | * commit 'f322b2073581119de5da74f92a03309a36891cfa': lavr: only save/restore the mixing matrix if mixing is being done rtpdec_vp8: Cosmetics: Fix bad alignment/indentation rtpenc: Allow including a SDES/CNAME block in RTCP SR packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_vp8: Cosmetics: Fix bad alignment/indentationMartin Storsjö2012-12-16
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Allow including a SDES/CNAME block in RTCP SR packetsMartin Storsjö2012-12-16
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8'Michael Niedermayer2012-12-17
|\| | | | | | | | | | | | | * commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8': rtpenc_vp8: Include the picture number in VP8 packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_vp8: Include the picture number in VP8 packetsMartin Storsjö2012-12-16
| | | | | | | | | | | | | | | | | | | | | | This makes it easier for receivers to decide what to do if data is lost. Refactor calculating the max payload size, to avoid hardcoding the header size in too many places, reducing the number of lines that have to be touched if the header is adjusted further. Signed-off-by: Martin Storsjö <martin@martin.st>
* | siff: set durationPiotr Bandurski2012-12-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | isom: support SGI RLE 8-bit in QuickTime file formatPeter Ross2012-12-17
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | Silicon Graphics Movie (.mv) demuxerPeter Ross2012-12-17
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | sctp: dont abort on invalid inputMichael Niedermayer2012-12-17
| | | | | | | | | | | | Fixes Ticket1865 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bfi: set durationPiotr Bandurski2012-12-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | brstm: ask for samples for version != 1.0Michael Niedermayer2012-12-16
| | | | | | | | | | | | This also avoids 2 unused variable warnings. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | brstm: add missing new line to request for sample messagesPaul B Mahol2012-12-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | build: fix idf demuxer dependencyPaul B Mahol2012-12-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | aiff: support in24/in32 tagsPiotr Bandurski2012-12-16
| | | | | | | | Supported by QuickTime, libaudiofile and Csound.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 13:00:07 +0000