summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'Michael Niedermayer2013-05-06
|\ | | | | | | | | | | | | | | | | | | * commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43': avformat: Add av_cold attributes to init functions missing them Conflicts: libavformat/rtpdec_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add av_cold attributes to init functions missing themDiego Biurrun2013-05-05
| |
* | id3v2: stop ignoring text encoding for chapter titlesPaul B Mahol2013-05-06
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Cosmetics: Reindent Sierra vmd demuxer after last commit.Carl Eugen Hoyos2013-05-05
| |
* | Support demuxing of audio-only vmd files.Carl Eugen Hoyos2013-05-05
| | | | | | | | Reviewed-by: Paul B Mahol
* | avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / YMichael Niedermayer2013-05-05
| | | | | | | | | | | | Demuxers where the changed code looked less readable where skiped Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f': sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes avs: Increase magic value score above file extension score Conflicts: libavformat/avs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixesDiego Biurrun2013-05-04
| |
| * avs: Increase magic value score above file extension scoreDiego Biurrun2013-05-04
| | | | | | | | | | This should fix misdetection of AVS files as AviSynth scripts when AviSynth support is enabled (Bugzilla #357).
* | Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0f8be6413b6a8d334d6052e610af32935c310af': avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate Conflicts: libavformat/ac3dec.c libavformat/avformat.h libavformat/avs.c libavformat/m4vdec.c libavformat/mov.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegvideodec.c libavformat/psxstr.c libavformat/pva.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriateDiego Biurrun2013-05-04
| |
| * build: output-example: Add avutil to ELIBS in link commandDiego Biurrun2013-05-04
| | | | | | | | | | | | | | | | | | output-example links against swscale, which depends on avutil. In standard configurations, by pure good luck, the libs before swscale pull in all of swscale's dependencies and linking succeeds. However, in some configurations like --disable-asm this is not the case and linking fails. Hardcode the dependency to avoid a more general Makefile refactoring.
* | Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | | | | | | | * commit '72e228b274a98af1aba9588415d0cd87fde44663': nut: K&R formatting cosmetics Conflicts: libavformat/nut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: K&R formatting cosmeticsLuca Barbato2013-05-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-05-04
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavf/matroskaenc: return an error for unsupported types. lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD. lavf: filter out AVSEEK_FLAG_BACKWARD in new API. lavf: call the new seek API from the old. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/matroskaenc: return an error for unsupported types.Nicolas George2013-05-04
| | |
| * | lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.Nicolas George2013-05-04
| | |
| * | lavf: filter out AVSEEK_FLAG_BACKWARD in new API.Nicolas George2013-05-04
| | | | | | | | | | | | Also document that it has no effect.
| * | lavf: call the new seek API from the old.Nicolas George2013-05-04
|/ / | | | | | | | | | | | | | | If the demuxer implements read_seek2() and not read_seek(), call avformat_seek_file() from av_seek_frame(). Allow to properly seek in formats that only implement the new API from applications that use the old one. Tested with mplayer and a concat script.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-04
|\| | | | | | | | | | | | | | | | | | | * qatar/master: wav: return meaningful errors Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wav: return meaningful errorsLuca Barbato2013-05-03
| |
* | Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'Michael Niedermayer2013-05-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * silly typo fixesDiego Biurrun2013-05-03
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: compat: msvc: Make sure the object files are included when linking statically id3v2: check for end of file while unescaping tags Conflicts: configure libavformat/id3v2.c Note, ffmpeg is not affected by the out of buffer write bug Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: check for end of file while unescaping tagsLuca Barbato2013-05-03
| | | | | | | | | | | | | | Prevent a serious out of buffer bound write. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521': matroskaenc: add an option to put the index at the start of the file Conflicts: doc/muxers.texi libavformat/matroskaenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: add an option to put the index at the start of the fileAnton Khirnov2013-05-03
| |
* | Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | * commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb': matroskaenc: cosmetics, reorder the #includes Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: cosmetics, reorder the #includesAnton Khirnov2013-05-03
| |
* | Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | * commit '13f57a4d881ec669b87bf82f424bfff502433060': wav: K&R formatting cosmetics Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wav: K&R formatting cosmeticsLuca Barbato2013-05-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | nutdec: Implement duration parsing for indexed nutsMichael Niedermayer2013-05-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-02
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: id3v2: K&R formatting cosmetics ppc: Only compile AltiVec FFT assembly when AltiVec is enabled Conflicts: libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: K&R formatting cosmeticsLuca Barbato2013-05-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-05-01
|\ \ | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavc: copy subtitle_header when copying context. lavf: data muxer and demuxer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf: data muxer and demuxer.Nicolas George2013-05-01
| | | | | | | | | | | | | | | | | | Allow to use tools designed to work with demuxers, muxers and packets (for example ffmpeg itself) to process raw byte streams (like aviocat).
* | | Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'Michael Niedermayer2013-05-01
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | * commit 'e926b5ceb1962833f0c884a328382bc2eca67aff': avformat: Drop unnecessary ff_ name prefixes from static functions Conflicts: libavformat/audiointerleave.c libavformat/mux.c libavformat/mxfenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Drop unnecessary ff_ name prefixes from static functionsDiego Biurrun2013-04-30
| |
* | framecrcenc: workaround design flaw in sidedata paletteMichael Niedermayer2013-04-30
| | | | | | | | | | | | | | This should be reverted once palettes are dealt with in a endian independant way in packets Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Recognize j2k as file suffix for the image2 muxer.Carl Eugen Hoyos2013-04-29
| |
* | Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'Michael Niedermayer2013-04-28
|\| | | | | | | | | | | | | | | | | | | * commit 'c14010541035454b4d3ad08399d70423be4e0c87': oma: K&R formatting cosmetics Conflicts: libavformat/omadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: K&R formatting cosmeticsLuca Barbato2013-04-27
| |
* | Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'Michael Niedermayer2013-04-28
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cf679b9476727a237c8006c685ace18acba149ab': hls, segment: fix splitting for audio-only streams. Conflicts: libavformat/hlsenc.c libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls, segment: fix splitting for audio-only streams.Anton Khirnov2013-04-27
| | | | | | | | CC:libav-stable@libav.org
* | avformat: Add black ops audio demuxerMichael Niedermayer2013-04-28
| | | | | | | | | | | | Fixes Ticket2064 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/write_packet: drop disabled codeMichael Niedermayer2013-04-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: set avoid_negative_ts based on flags if not overridden by user ↵Michael Niedermayer2013-04-26
| | | | | | | | | | | | | | | | or muxer This changes the default to avoid negative timestamps. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: mov/mp4 should support negative timestamps through edit listsMichael Niedermayer2013-04-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: assert that timestamps are positive after offsetting themMichael Niedermayer2013-04-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: use a local variable for offsetMichael Niedermayer2013-04-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 08:21:40 +0000