RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
65,131 Commits 37 Branches 400 Tags 271 MiB
Commit Graph

65131 Commits

Author SHA1 Message Date
Michael Niedermayer dd200c56c0 avcodec/dvdsubdec: free subtitle rectangles if nothing is output 
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 14:17:46 +02:00
Michael Niedermayer ceff29b9ad avcodec/resample: check for malloc failure 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 13:04:28 +02:00
Michael Niedermayer 72555f4a38 avcodec/pthread_slice: Check for malloc failure 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 12:56:21 +02:00
Michael Niedermayer 37ec7d291e avcodec/mpeg4video_parser: Check for extradata parsing failure 
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 12:56:21 +02:00
Gerion Entrup dc315cdb4e doc: add very basic libcdio documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 02:54:17 +02:00
Nicolas Martyanoff 467e9d6186 avformat/hlsenc: add some empty lines to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:33:49 +02:00
Nicolas Martyanoff 706fcffce1 avformat/hlsenc: rename some identifers to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:31:49 +02:00
Nicolas Martyanoff 53f10e0368 avformat/hlsenc: Add some comments to make the code easier to read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-31 00:04:05 +02:00
Michael Niedermayer a99de9ca2c Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011' 
* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 23:34:25 +02:00
Diego Biurrun a0ce85ac7d configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled 2014-07-30 11:55:40 -07:00
Reimar Döffinger 1c84aad718 movdec: remove nonsensical snprintf. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-07-30 20:25:29 +02:00
Reimar Döffinger 04aec74f45 mxfdec: add missing "const" to array declaration. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-07-30 20:25:29 +02:00
Michael Niedermayer 547d64a49a ffprobe: print some basic information about avframe side data 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 19:23:08 +02:00
Michael Niedermayer ba3e3311ef avutil/frame: add av_frame_side_data_name() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 19:19:22 +02:00
Michael Niedermayer 6f622e5fcb avfilter/f_select: avoid double->int in debug output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:50:35 +02:00
Michael Niedermayer bcbfb95b0e avfilter/f_select: Set var_values[VAR_KEY] correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:49:26 +02:00
Michael Niedermayer 887d8d293f avfilter/f_select: avoid using doubles for equals checks and casts to enums 
This might silence some warnings.

Issue found from: a8d803a320
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:37:09 +02:00
Michael Niedermayer 7994c1cd76 Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905' 
* commit 'a8d803a320fb08b3ad5db4fffc79abd401206905':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion

Conflicts:
	libavfilter/f_select.c

Not merged, see next commit for the bugfix

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-30 17:32:15 +02:00
Nicolas George 91244073fd ffmpeg_filter: refuse to configure input without a decoder. 
The decoder is necessary in order to filter frames.
This makes the error message clearer in this case:
currently, it will usually fail because the pixel or sample
format is not defined and is converted into "(null)"
(non-portable).

Enhance trac ticket #3779.
 2014-07-30 14:40:45 +02:00
Carl Eugen Hoyos ff9a154157 Add int64_t probesize2 instead of int probesize to AVFormatContext. 
Allows to set a probesize >2G.
Tested-by: Oliver Fromme
 2014-07-30 11:09:25 +02:00
Carl Eugen Hoyos 355121bcb5 lavf/mux: Fix a typo checking aspect ratios. 
Fixes ticket #3813.
 2014-07-30 11:03:29 +02:00
gerion.entrup@t-online.de f2855eb4d7 avformat/movenc: add m4b to list of ipod playable files 
m4b is the extension used by iDevices to detect audiobooks.
 2014-07-30 04:19:58 +02:00
Christophe Gisquet a507623bad x86: hevc_mc: fix register count usage 
A macro was using a fixed register, causing too many GPRs to be
declared as used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 22:50:50 +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 58eaa95116 Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e' 
* commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e':
  mpegvideo: move vol_control_parameters to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:26:59 +02:00
Michael Niedermayer 92de445034 Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a' 
* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a':
  matroska: Register mime types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:18:11 +02:00
Michael Niedermayer 8cad746093 Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd' 
* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd':
  aac: Register the mime type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:12:07 +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
Diego Biurrun a8d803a320 vf_select: Drop a debug av_log with an unchecked double to enum conversion 
CC: libav-stable@libav.org
 2014-07-29 09:37:01 -07:00
Nidhi Makhijani ccbf370f20 mpegvideo: move vol_control_parameters to the only place it is used 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-29 09:13:18 -07:00
Luca Barbato fa38573cd9 matroska: Register mime types 2014-07-29 17:47:32 +02:00
Luca Barbato 02cf0c9e42 aac: Register the mime type 
Speed up probing ADTS live streams that are not frame-aligned such
as http://mp3.streampower.be/radio1.aac .
 2014-07-29 17:47:32 +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
Nicolas Martyanoff 0c889da8cb avformat/hlsenc: fix cleanup after avformat_write_header() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 16:24:11 +02:00
Luca Barbato e253a9e2b3 avformat: Move av_probe_input* to format.c 2014-07-29 15:18:51 +02:00
James Almer 73c4f63ba5 x86/hevc_deblock: add add ff_hevc_[hv]_loop_filter_luma_{8, 10, 12}_avx 
~5% faster than SSSE3

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 14:04:59 +02:00
James Almer 88ba821f23 x86/hevc_deblock: improve luma functions register allocation 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 13:38:05 +02:00
James Almer c74b08c5c6 x86/hevc_deblock: remove some unnecessary instructions 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 13:27:44 +02:00
Christophe Gisquet 65746bfbae hevc_filter: run vertical and horizontal together 
This should help cache locality. On win64:
Before: 1397x cycles, 16216 bytes
After:  1369x cycles, 16040 bytes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 03:56:43 +02:00
James Almer 4f91bb0ff0 x86/hevc_deblock: use psignw instead of pmullw where possible 
It's slightly faster

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 03:42:29 +02:00
Michael Niedermayer 983109bbd9 Merge commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc' 
* commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc':
  caf: Use correct printf conversion specifiers for POSIX int types

Conflicts:
	libavformat/cafdec.c

See: 1f36ebf63a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 01:40:23 +02:00
Michael Niedermayer d55d8229fb Merge commit '019a28cd630286ecb2b06ee62025a17c821b493e' 
* commit '019a28cd630286ecb2b06ee62025a17c821b493e':
  sanm: Use correct printf conversion specifiers for POSIX int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 01:22:46 +02:00
Michael Niedermayer 60831f441d Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4' 
* commit '59ca29a560ba0cfe97457de8cedf77db434f0de4':
  dump: Use correct printf conversion specifiers for POSIX int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 00:41:00 +02:00
Michael Niedermayer a91c5ed008 Merge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d' 
* commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d':
  x86: build: Restore ordering of OBJS lines

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 00:34:53 +02:00