summaryrefslogtreecommitdiff
path: root/libavformat/format.c
Commit message (Collapse)AuthorAge
* avformat/format: Use av_match_name() instead of list in av_match_ext()Michael Niedermayer2014-10-23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/format: move mime_type_opt declaration to where its usedMichael Niedermayer2014-10-10
| | | | | | also remove a related dead store Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'Michael Niedermayer2014-10-08
|\ | | | | | | | | | | | | | | | | | | * commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7': avformat: use const char* instead of uint8_t* for AVProbeData.mime_type Conflicts: libavformat/format.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: use const char* instead of uint8_t* for AVProbeData.mime_typeAndreas Cadhalpun2014-10-08
| | | | | | | | | | | | | | This makes the field consistent with AVInputFormat.mime_type and the argument type of av_match_name. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * probe: Bump the score for mime type matchingAndreas Cadhalpun2014-09-26
| | | | | | | | | | | | It should be more trustworthy than extension matching. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avutil/avstring: Factor av_match_list() outMichael Niedermayer2014-10-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for ↵Andreas Cadhalpun2014-09-13
| | | | | | | | | | | | | | matching mime types Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format: Run image2 probe again when file content data is availableMichael Niedermayer2014-09-12
| | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format: remove unused variableMichael Niedermayer2014-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b': Remove obsolete FF_API_PROBE_MIME cruft. Conflicts: libavformat/avformat.h libavformat/format.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_PROBE_MIME cruft.Anton Khirnov2014-08-09
| |
* | avformat/format: Check for av_guess_format() failureMichael Niedermayer2014-08-02
| | | | | | | | | | | | | | Fixes null pointer dereference Fixes Ticket3812 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format: use av_match_name() in av_guess_codec()Michael Niedermayer2014-08-02
| | | | | | | | | | | | Fixes part of Ticket2236 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format: fix memleak and error codeMichael Niedermayer2014-07-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format.c: remove duplicate include, put libavutil includes togetherMichael Niedermayer2014-07-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format: simplify ifdefferyMichael Niedermayer2014-07-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: fix probe mime version checksMichael Niedermayer2014-07-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | | | | | | | | | * commit '3a19405d574a467c68b48e4b824c76617fd59de0': avformat: Use the mime type information in input probe Conflicts: libavformat/format.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use the mime type information in input probeLuca Barbato2014-07-29
| | | | | | | | | | It should provide a quicker guess for elementary streams provided by http.
* | Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '69e7336b8e16ee65226fc20381baf537f4b125e6': avstring: Expose the simple name match function Conflicts: libavutil/avstring.c libavutil/avstring.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avstring: Expose the simple name match functionLuca Barbato2014-07-29
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c': avformat: Move av_probe_input* to format.c Conflicts: libavformat/format.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Move av_probe_input* to format.cLuca Barbato2014-07-29
| |
* | Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'Michael Niedermayer2014-07-27
|\| | | | | | | | | | | | | | | | | | | * commit 'ec4f04da1a3462dac429b9d15dee5f027309da15': avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const Conflicts: libavformat/format.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as constDiego Biurrun2014-07-26
| |
* | avformat/format: av_register_output_format() and av_register_intput_format() ↵Michael Niedermayer2013-12-17
| | | | | | | | | | | | | | that work in O(1) time Reviewed-by: Stefano Sabatini Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | do O(1) instead of O(n) atomic operations in register functionsMichael Niedermayer2013-12-06
| | | | | | | | | | | | about 1ms faster startup time Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: make av_register_*put_format() thread safeMichael Niedermayer2013-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'Michael Niedermayer2013-06-16
|/ | | | | | | | | | * commit 'afc8685395e775fe0f2a1698b683aea4afd124af': avf: split off format register and lookup function Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* avf: split off format register and lookup functionLuca Barbato2013-06-16