virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
112,464 Commits 37 Branches 400 Tags 458 MiB
fff875a7f4
Commit Graph

63 Commits

Author SHA1 Message Date
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