summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/bink: Check return value of av_add_index_entry()Michael Niedermayer2014-02-17
| | | | | | | Fixes null pointer dereference Fixes: cdbf15cbd0a27cee958dd0b8800e452e-signal_sigsegv_737991_2083_cov_317652874_LBSTART.BIK Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-17
|\ | | | | | | | | | | | | * qatar/master: doxygen: Replace @parblock syntax with manual linebreaks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Replace @parblock syntax with manual linebreaksDiego Biurrun2014-02-17
| | | | | | | | @parblock is only supported in very recent Doxygen versions.
* | Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'Michael Niedermayer2014-02-17
|\| | | | | | | | | | | | | | | | | | | * commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53': doxygen: Add a number of missing function parameter descriptions Conflicts: libavformat/avformat.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Add a number of missing function parameter descriptionsDiego Biurrun2014-02-17
| |
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2014-02-17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavd: add list devices API lavd/opengl_enc_shaders: fix gray* shader Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavd: add list devices APILukasz Marek2014-02-16
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | | Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'Michael Niedermayer2014-02-17
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90': Move all example programs to doc/examples Conflicts: configure doc/Makefile doc/doxy-wrapper.sh doc/examples/avcodec.c doc/examples/decoding_encoding.c doc/examples/metadata.c doc/examples/muxing.c doc/examples/transcode_aac.c libavcodec/Makefile libavcodec/api-example.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Move all example programs to doc/examplesDiego Biurrun2014-02-16
| | | | | | | | | | | | Also drop support for building examples in library directories.
* | | lavf/avio: Introduce avio_find_protocol_nameAlexander Strasser2014-02-16
| |/ |/| | | | | | | | | | | Make it possible to find out what protocol will be chosen for a given URL. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | avformat/mov: fix avg_frame_rate calculationMichael Niedermayer2014-02-16
| | | | | | | | | | | | | | Fixes integer overflow Fixes Ticket3390 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec/vorbis: fix stream duration conditionHendrik Leppkes2014-02-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: skip the MPEG-2 style dts/pts code for HEVCMichael Niedermayer2014-02-14
| | | | | | | | | | | | | | | | This extends the exception from H264 to H264 + HEVC Fixes Ticket3385 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'Michael Niedermayer2014-02-14
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8a2250344b19a343d830a902dbcf4c0b929ea49b': jv: detect partial packets in the demuxer Conflicts: libavformat/jvdec.c See: 9d0c71e5e34dec2c6246bf47da8d9674c92f85c1 See: b948ab8132e24d215072120e210139dc456d4997 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jv: detect partial packets in the demuxerJanne Grunau2014-02-12
| | | | | | | | | | Fixes fate-jv under valgrind which reports a different CRC for the last frame from a partial read.
* | avformat/mpegts: DVB subtitles multiple languages supportmrlika2014-02-14
| | | | | | | | | | | | | | | | Copy multiple languages data from PMT to extradata. New 5 bytes per language extradata format. Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Check data array size in mpegts_write_pmt()Michael Niedermayer2014-02-13
| | | | | | | | | | | | Prevents out of array writes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts muxer: DVB subtitles multiple languages supportmrlika2014-02-13
| | | | | | | | | | | | | | | | * restore multiple languages data from extradata to PMT table * setting correctly hearing empaired subtitling type Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: pass on error code from avio_seek()Michael Niedermayer2014-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | * qatar/master: asfdec: fix seeking with fragmented packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: fix seeking with fragmented packetsJanne Grunau2014-02-12
| | | | | | | | | | | | | | After seeking fragments with an offset > 0 must be skipped to correctly assemble packets. Bug-Id: 43
* | Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | * commit '0c082565965258dca143767cc6cb25e38b6e9ea3': asfdec: short-circuit seeking to the start of stream Conflicts: libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: short-circuit seeking to the start of streamAndrew Kelley2014-02-12
| | | | | | | | | | | | Bug-id: 43 Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge commit '0ebb523f072322972ea446616676fff32e9603c6'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ebb523f072322972ea446616676fff32e9603c6': asfdec: check ff_get_guid() return values during seeking Conflicts: libavformat/asfdec.c The code that pretends that a truncated index is correct and complete is not merged as it obviously would cause problems if a really truncated index is encountered If someone has samples that work better with that hack, please share them / mail me also the bug this apparently attempts to fix isnt reproducable before this in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: check ff_get_guid() return values during seekingJanne Grunau2014-02-12
| | | | | | | | | | Hitting EOF during seeking is quite likely. Fixes use of uninitialized data during fate-seek-lavf-asf.
* | avformat/riff: return error code from ff_get_guid()Michael Niedermayer2014-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: fix keyframe flags for sample from chromium Issue 340865Michael Niedermayer2014-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/lavd: version bump and APIchanges for uncoded frames.Nicolas George2014-02-11
| |
* | lavf: add uncodedframecrc test muxer.Nicolas George2014-02-11
| |
* | lavf: add write_uncoded_frame() API.Nicolas George2014-02-11
| |
* | avformat/libssh: Fix libssh defaulting to shared linkage.Matt Oliver2014-02-11
| | | | | | | | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com> See: [FFmpeg-devel] Fix libssh static linkage on Windows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703': lavf: always unref the packet passed to av_interleaved_write_frame() on error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: always unref the packet passed to av_interleaved_write_frame() on errorAnton Khirnov2014-02-10
| |
* | avformat/concatdec: pass the interrupt callback onZhang Rui2014-02-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '18c896be3d8e926ef806e7de29c4a168d7763389'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '18c896be3d8e926ef806e7de29c4a168d7763389': lavf: extend / improve the AVFormatContext doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: extend / improve the AVFormatContext doxyAnton Khirnov2014-02-10
| |
* | Merge commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '54f7e79d4706a8343dad1d8da51b7d3d3b2cd3b2': lavf: add some basic documentation of the muxing process Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add some basic documentation of the muxing processAnton Khirnov2014-02-10
| |
* | Merge commit '4c750599509c3973afbe2850953a1fb963f696e5'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '4c750599509c3973afbe2850953a1fb963f696e5': lavf: rewrite the av_write_frame() doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: rewrite the av_write_frame() doxyAnton Khirnov2014-02-10
| | | | | | | | | | Remove some vague / incorrect statements and make the text more specific and less confusing.
* | Merge commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit 'ad7f2b69a546ec65ef6b11e1a0fd58e6bb66bc4b': lavf: rewrite the av_interleaved_write_frame() doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: rewrite the av_interleaved_write_frame() doxyAnton Khirnov2014-02-10
| | | | | | | | | | Remove some vague / incorrect statements and make the text more specific and less confusing.
| * pcmdec: replace a reachable assert with an error checkAnton Khirnov2014-02-10
| | | | | | | | | | | | Libavformat should not make any assumptions about values returned from other libraries. This assert is easily reachable by using a non-raw codec id.
| * mxfdec: free descriptor extradata in .read_close()Janne Grunau2014-02-09
| | | | | | | | Fixes memleak in fate-mxf-demux.
* | lavf: allow av_find_best_stream to return AV_DISPOSITION_*_IMPAIRED ↵Marton Balint2014-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | wanted_streams Previously these type of streams were not returned even if wanted stream was set to a stream of such. Now they are only skipped if they are not wanted streams. Fixes ffplay -sst <stream number> out.ts where stream number is a *_IMPAIRED stream. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'Michael Niedermayer2014-02-09
|\| | | | | | | | | | | | | * commit 'b0c2c097e422b9e10a7d856582f8321d28af821e': lavf: default .ogg audio to libvorbis if we can Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: default .ogg audio to libvorbis if we canAndrew Kelley2014-02-09
| | | | | | | | | | | | | | | | | | | | | | | | Since 2007, the Xiph.org Foundation recommends that .ogg only be used for Ogg Vorbis audio files. Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions However we only do it if we have libvorbis available because the built in vorbis encoder is not as good. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * Add raw HEVC muxerDerek Buitenhuis2014-02-09
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Add raw HEVC muxerDerek Buitenhuis2014-02-09
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Mirillis FIC video decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>