summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* lavf/img2enc: use FF_CEIL_RSHIFT().Clément Bœsch2013-05-16
|
* Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer2013-05-16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out debug #define cruftDiego Biurrun2013-05-16
| |
* | Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d': Remove commented-out #includes h263dec: Remove broken and disabled debug cruft vc1: Reindent INIT_LUT(), align backslashes Conflicts: libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out #includesDiego Biurrun2013-05-15
| |
* | lavf/concat: reject empty scripts.Nicolas George2013-05-15
| | | | | | | | Fix trac ticket #2566.
* | wv: make probing more robustPaul B Mahol2013-05-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-05-15
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Reduce probing score for flic animation files. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Reduce probing score for flic animation files.Carl Eugen Hoyos2013-05-15
| | | | | | | | | | | | Fixes ticket #2567.
* | | replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*Michael Niedermayer2013-05-15
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01': fate: update the mmf reference mmf: Write metadata into an Optional Data chunk jpeg2000dec: Use correct printf length modifier for pointer differences Conflicts: libavformat/mmf.c tests/ref/lavf/mmf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mmf: Write metadata into an Optional Data chunkYoshihisa Uchida2013-05-14
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/srtdec: Fix pointer corruptionMichael Niedermayer2013-05-14
| | | | | | | | | | | | | | This fixes use of uninitialized memory and possible out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | md5enc: don't reuse priv_class in two formatsHendrik Leppkes2013-05-13
| | | | | | | | | | | | Apparently, this is not allowed and can trip up all sorts of things. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add a generic hash API.Reimar Döffinger2013-05-13
| | | | | | | | | | | | Also use this API in framemd5. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Better handling for MXF essence reading reaching EOF.Joseph Artsimovich2013-05-13
| | | | | | | | | | | | | | | | If no metadata follows MXF essence, that is essence ends with EOF, "Operation not permitted" error was produced and a non-zero code was returned from ffmpeg executable. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not read strd chunk in avi files as H264 extradata.Carl Eugen Hoyos2013-05-13
| | | | | | | | Fixes ticket #2561.
* | redspark: fix memleak in redspark_read_headerPaul B Mahol2013-05-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ADPCM IMA Radical decoderJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | RedSpark demuxerJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | RSD demuxerJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ADP demuxerJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avidec: Enable full parsing for potencoder mpeg1/2Michael Niedermayer2013-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-10
|\| | | | | | | | | | | | | | | | | | | * qatar/master: mmf: K&R formatting cosmetics Conflicts: libavformat/mmf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mmf: K&R formatting cosmeticsLuca Barbato2013-05-09
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'Michael Niedermayer2013-05-08
|\| | | | | | | | | | | | | * commit 'db9aee6ccf183508835acc325f5ad87d595eacc4': oma: properly forward errors in oma_read_packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: properly forward errors in oma_read_packetLuca Barbato2013-05-07
| | | | | | | | | | | | Prevent spurios EIO on EOF. CC:libav-stable@libav.org
* | Merge commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0'Michael Niedermayer2013-05-08
|\| | | | | | | | | | | | | * commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0': oma: return meaningful errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: return meaningful errorsLuca Barbato2013-05-07
| |
* | Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'Michael Niedermayer2013-05-08
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe': nut: use meaningful error values FATE: use a less ambiguous end time for filter-trim-time test Conflicts: libavformat/nutdec.c tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: use meaningful error valuesLuca Barbato2013-05-07
| | | | | | | | Fix the mispresented EINVAL for EOF on partial files, among the other.
* | avformat/vqf: check number of channels before use.Michael Niedermayer2013-05-07
| | | | | | | | | | | | | | Fixes division by zero Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroska: set "done" only during resync fail.Reimar Döffinger2013-05-07
| | | | | | | | | | | | Fixes playback of test7.mkv validation test file. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavf/mpsub: remove sscanf from probing.Clément Bœsch2013-05-06
| | | | | | | | This should make probing faster.
* | wav_seek_tag: fix integer overflowMichael Niedermayer2013-05-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-06
|\| | | | | | | | | | | | | | | | | | | * qatar/master: wav: Always seek to an even offset Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wav: Always seek to an even offsetLuca Barbato2013-05-06
| | | | | | | | | | | | | | RIFF chunks are aligned to 16bit according to the specification. Bug-Id:500 CC:libav-stable@libav.org
* | Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'Michael Niedermayer2013-05-06
|\| | | | | | | | | | | | | | | * commit '46c1917350f58dfab84e41919e6c02d43950db8c': nut: use a define for the nut version bgmc: Do not mark ff_bgmc_decode_init() as av_cold Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: use a define for the nut versionLuca Barbato2013-05-06
| | | | | | | | Ease switching version in the future and make evident why that value.
* | 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
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 00:36:11 +0000