summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'Michael Niedermayer2014-04-02
|\ | | | | | | | | | | | | * commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509': lavf: add supported extension to avi and mov demuxers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add supported extension to avi and mov demuxersMarc-Antoine Arnaud2014-04-02
| |
* | Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * More correct printf format specifiersDiego Biurrun2014-04-02
| | | | | | | | This avoids compiler warnings about argument and specifier type mismatch.
| * OpenEXR decoderJimmy Christensen2014-04-01
| | | | | | | | | | | | | | Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno, Nicolas George, Paul B Mahol and Michael Niedermayer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/img2dec: zero probe bufferMichael Niedermayer2014-03-31
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes valgrind failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-31
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: mov: Unbreak sbtl writing Conflicts: libavformat/movenc.c See: 8a9d0a1561470a185a3d09676fcf9b44830a4bfe Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Unbreak sbtl writingMichael Niedermayer2014-03-31
| |
| * mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhdMichael Niedermayer2014-03-31
| | | | | | | | | | | | This also moves mov_rewrite_dvd_sub_extradata() to mov.c. Sample-Id: NeroRecodeSample.mp4
* | Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'Michael Niedermayer2014-03-31
|\| | | | | | | | | | | | | | | * commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8': mov: fill in subtitle dimensions after parsing tkhd See: 8ba432bc56f2d3ef534be7d3ccc1c9b3c0ea3091 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: fill in subtitle dimensions after parsing tkhdMichael Niedermayer2014-03-31
| | | | | | | | Sample-Id: NeroRecodeSample.mp4
| * isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()Michael Niedermayer2014-03-31
| | | | | | | | Sample-Id: NeroRecodeSample.mp4
| * isom: Simplify mov_rewrite_dvd_sub_extradata()Michael Niedermayer2014-03-31
| | | | | | | | This avoids the 2nd buffer and fixes the palette truncated check
* | avformat/wtvenc: advise user when H264 startcode is not presentPeter Ross2014-03-30
| | | | | | | | | | | | | | Fixes ticket #3473. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcodePeter Ross2014-03-30
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avio: also set generic URL context optionsMichael Niedermayer2014-03-30
| | | | | | | | | | | | This should have no effect currently as there are no such options yet. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wtvenc: pad judiciously when writing mpeg2 extradataPeter Ross2014-03-30
| | | | | | | | | | | | | | Padding rule described here http://msdn.microsoft.com/en-us/library/windows/desktop/dd390707(v=vs.85).aspx Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wtvdec: demux mpeg2 extradataPeter Ross2014-03-30
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/replaygain: remove unused variableMichael Niedermayer2014-03-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: fix if vs if elseMichael Niedermayer2014-03-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-29
|\| | | | | | | | | | | | | * qatar/master: movenc: Add dvd subtitle support Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add dvd subtitle supportJohn Stebbins2014-03-28
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/img2_alias_pix: rewrite probe functionMichael Niedermayer2014-03-29
| | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix ↵Michael Niedermayer2014-03-29
| | | | | | | | | | | | probing Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: Use avformat probing interface to identify format if it ↵Michael Niedermayer2014-03-28
| | | | | | | | | | | | | | | | | | | | has not been otherwise identified This is used only for distinguishing .pix formats for now. Which is the only case that has image2 demuxers currently Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add image2 brender pix demuxerMichael Niedermayer2014-03-28
| | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add image2 alias pix demuxerMichael Niedermayer2014-03-28
| | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/img2dec: make image2dec capable to be used from seperate demuxersMichael Niedermayer2014-03-28
| | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'Michael Niedermayer2014-03-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033': PAF demuxer and decoder Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/paf.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/paf.c libavformat/version.h See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * PAF demuxer and decoderPaul B Mahol2014-03-27
| | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'Michael Niedermayer2014-03-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * BRender PIX image decoderAleksi Nurmi2014-03-27
| | | | | | | | | | | | Further enhancements by Vittorio Giovara and Paul B Mahol. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'Michael Niedermayer2014-03-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b': Alias PIX image encoder and decoder Conflicts: Changelog libavcodec/allcodecs.c libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Alias PIX image encoder and decoderVittorio Giovara2014-03-26
| |
* | libavformat/aviobuf: keep track of the original buffer-size and restore it ↵Michael Niedermayer2014-03-26
| | | | | | | | | | | | after probe/ensure-seekback Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: ffio_ensure_seekback: only copy the initialized part of ↵Michael Niedermayer2014-03-26
| | | | | | | | | | | | the buffer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add an .oga muxer.Carl Eugen Hoyos2014-03-25
| |
* | avformat/riff: add On2 VP7 fourccsPeter Ross2014-03-25
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | * commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7': mp3dec: export replaygain tags from ID3v2 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3dec: export replaygain tags from ID3v2Anton Khirnov2014-03-24
| |
* | Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78': Add replaygain side data type and code for parsing replaygain tags. Conflicts: libavcodec/avcodec.h libavcodec/version.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add replaygain side data type and code for parsing replaygain tags.Anton Khirnov2014-03-24
| |
* | Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '25b32586566f285d797737863c97a1c5c9c84e2b': lavf: add an AVStream field for exporting stream-global side data Conflicts: libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add an AVStream field for exporting stream-global side dataAnton Khirnov2014-03-24
| |
* | Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | * commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7': mpeg: K&R formatting cosmetics Conflicts: libavformat/mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: K&R formatting cosmeticsTanja Batchelor2014-03-24
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | lavf/concatdec: allow to match streams by id.Nicolas George2014-03-23
| | | | | | | | | | | | That makes the concat demuxer usable with MPEG-PS streams, even when the streams in the different parts are detected in different order.
* | http: restructure http_connect error handling pathwm42014-03-23
| | | | | | | | | | | | | | | | The authstr memory allocations make it annoying to error in the middle of the header setup code, so apply the usual C error handling idiom to make it easier to error at any point. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'Michael Niedermayer2014-03-23
|\| | | | | | | | | | | | | | | | | | | * commit '1e9db41e2a2166be5671b088ef4ad06a40af459f': movenc: Allow override of major brand in ftyp atom Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow override of major brand in ftyp atomJohn Stebbins2014-03-23
| | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 04:15:35 +0000