virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
78,993 Commits 37 Branches 400 Tags 460 MiB
ac1974652b
Commit Graph

40 Commits

Author SHA1 Message Date
Michael Niedermayer
77864be44a avformat/format: Weight the filename extension higher if there is nearly no data after an ID3 available 
Fixes Ticket5205

Based-on-patch-by: Carl Eugen Hoyos
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-30 22:25:31 +01:00
Michael Niedermayer
8619582bdf avformat/format: Replace nodat by enum 
This makes the code much more readable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-30 22:25:31 +01:00
Ganesh Ajjanagadde
6ea457f76d avformat/format: silence -Wdiscarded-qualifiers 
lpd.buf is non-const and discards the const qualifier of zerobuffer.
This fixes -Wdiscarded-qualifiers observed with a variety of compilers, including GCC 5.2.
Note that this does not change the type of zerobuffer, and merely makes the intent explicit.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-20 02:14:18 +02:00
Timothy Gu
d36eac698f Revert "avformat/format: silence -Wdiscarded-qualifiers" 
This reverts commit 27cbe4588a.

See
https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179002.html

Requested-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2015-09-16 19:53:13 -07:00
Ganesh Ajjanagadde
27cbe4588a avformat/format: silence -Wdiscarded-qualifiers 
lpd.buf is non-const and discards the const qualifier of zerobuffer.
This fixes -Wdiscarded-qualifiers observed with GCC 5.2.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-16 16:24:56 -07:00
Clément Bœsch
c8370a17f5 avformat: fix style after recent commits 2015-09-14 17:42:56 +02:00
Alex Agranovsky
9b10ae5727 avformat/format: Remove parameters from mime type before comparission for probing 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-12 00:42:18 +02:00
Michael Niedermayer
75a730a22b avformat/format: Add generic trace av_log in av_probe_input_format3() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-25 03:43:59 +02:00
Anshul Maheshwari
a47c9331ef avformat: Improve data streams/codec support 
This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 02:24:08 +01:00
Michael Niedermayer
cebe8c8095 avformat/format: Use av_match_name() instead of list in av_match_ext() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-23 04:33:09 +02:00
Michael Niedermayer
e96fb980dc avformat/format: move mime_type_opt declaration to where its used 
also remove a related dead store

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-10 03:08:11 +02:00
Michael Niedermayer
911ba8fb19 Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7' 
* 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>
 2014-10-08 21:35:40 +02:00
Andreas Cadhalpun
b15b06ebf5 avformat: use const char* instead of uint8_t* for AVProbeData.mime_type 
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>
 2014-10-08 15:13:15 +01:00
Michael Niedermayer
0d92b0d5f4 avutil/avstring: Factor av_match_list() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-02 18:51:05 +02:00
Andreas Cadhalpun
883e98bc25 probe: Bump the score for mime type matching 
It should be more trustworthy than extension matching.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-09-26 20:56:16 +02:00
Andreas Cadhalpun
bcac0f4010 lavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for matching mime types 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-13 00:37:35 +02:00
Michael Niedermayer
917d14e6a2 avformat/format: Run image2 probe again when file content data is available 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-12 18:20:38 +02:00
Gabriel Dume
4b1f5e5090 cosmetics: Write NULL pointer inequality checks more compactly 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-15 05:34:13 -07:00
Michael Niedermayer
fce8817a01 avformat/format: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-14 20:40:11 +02:00
Michael Niedermayer
c218d8218d Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b' 
* 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>
 2014-08-10 01:36:21 +02:00
Anton Khirnov
24e87f7f42 Remove obsolete FF_API_PROBE_MIME cruft. 2014-08-09 16:59:21 +00:00
Michael Niedermayer
98e42a249e avformat/format: Check for av_guess_format() failure 
Fixes null pointer dereference
Fixes Ticket3812

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 04:16:02 +02:00
Michael Niedermayer
26ffa8eaee avformat/format: use av_match_name() in av_guess_codec() 
Fixes part of Ticket2236

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-02 03:39:38 +02:00
Michael Niedermayer
d38edeee9b avformat/format: fix memleak and error code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:38:15 +02:00
Michael Niedermayer
4182728c78 avformat/format.c: remove duplicate include, put libavutil includes together 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:35:07 +02:00
Michael Niedermayer
6d69503883 avformat/format: simplify ifdeffery 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:33:10 +02:00
Michael Niedermayer
9694695a21 avformat: fix probe mime version checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:02:48 +02:00
Michael Niedermayer
80a3a6611f Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0' 
* 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>
 2014-07-29 20:57:42 +02:00
Michael Niedermayer
31e0b5d3cb Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6' 
* 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>
 2014-07-29 20:24:42 +02:00
Michael Niedermayer
e066f01539 Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c' 
* commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c':
  avformat: Move av_probe_input* to format.c

Conflicts:
	libavformat/format.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 20:02:09 +02:00
Luca Barbato
3a19405d57 avformat: Use the mime type information in input probe 
It should provide a quicker guess for elementary streams provided
by http.
 2014-07-29 17:47:26 +02:00
Luca Barbato
69e7336b8e avstring: Expose the simple name match function 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-29 17:46:29 +02:00
Luca Barbato
e253a9e2b3 avformat: Move av_probe_input* to format.c 2014-07-29 15:18:51 +02:00
Michael Niedermayer
6542e5575f Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15' 
* 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>
 2014-07-27 02:09:41 +02:00
Diego Biurrun
ec4f04da1a avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const 2014-07-26 14:51:16 -07:00
Michael Niedermayer
49f10c9cb1 avformat/format: av_register_output_format() and av_register_intput_format() that work in O(1) time 
Reviewed-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-17 01:07:43 +01:00
Michael Niedermayer
133fbfc781 do O(1) instead of O(n) atomic operations in register functions 
about 1ms faster startup time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-06 15:27:36 +01:00
Michael Niedermayer
53fd1ab26b avformat: make av_register_*put_format() thread safe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 03:46:10 +02:00
Michael Niedermayer
4a522eff00 Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af' 
* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
  avf: split off format register and lookup function

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-16 23:38:27 +02:00
Luca Barbato
afc8685395 avf: split off format register and lookup function 2013-06-16 14:00:40 +02:00