virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
61,379 Commits 37 Branches 400 Tags 464 MiB
e52d97a7ac
Commit Graph

61379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
5d75730c58 avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag() 
Fixes Ticket3421

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 19:20:47 +01:00
Michael Niedermayer
01000064c9 avidec: calculate missing bitrates from index 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 19:20:47 +01:00
Michael Niedermayer
52b6db848d Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Decode png images without iend chunk.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 13:57:55 +01:00
Anshul Maheshwari
61f96be08a Documented av_dump_format 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 13:24:53 +01:00
Matt Oliver
99b48fd448 Fix modplug linkage on Windows. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 13:22:49 +01:00
Diego Biurrun
d92024f18f lavf: more correct printf format specifiers 2014-03-11 13:13:41 +01:00
Carl Eugen Hoyos
666749f669 Decode png images without iend chunk. 
Fixes ticket #3357.
 2014-03-11 09:56:38 +01:00
Michael Niedermayer
e161c1bbfc avcodec/mjpegdec: support adob transform 2 
Fixes Ticket3426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 04:20:23 +01:00
Michael Niedermayer
e893440a28 configure: make it possible to disable xlib dependancy 
The unconditional dependancy was added in 7671dd7cd7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 03:12:34 +01:00
Michael Niedermayer
9a05e8a385 doc/APIchanges: fill in dates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 01:21:56 +01:00
Michael Niedermayer
4775424446 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Define ff_log2_run[] in libavcodec/internal.h.
  Replace an incorrect av_free() in movenc.c with av_freep().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 00:53:24 +01:00
Michael Niedermayer
4da8dc64be Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: miscellaneous cosmetics

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 00:09:56 +01:00
Michael Niedermayer
cbe92a9302 Merge commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7' 
* commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7':
  lavf: always use av_free

See: 88c8e4afea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 23:55:41 +01:00
Diego Biurrun
7caf48e036 configure: miscellaneous cosmetics 
Sort lists of components. Add some whitespace where it helps readability.
Consistently use double instead of single quotes around component lists.
 2014-03-10 23:52:52 +01:00
Michael Niedermayer
7f90055470 Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b' 
* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b':
  lavf: simplify ff_hevc_annexb2mp4_buf

Conflicts:
	libavformat/hevc.c
	libavformat/hevc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 23:38:01 +01:00
Michael Niedermayer
182c674f68 Merge commit '4a8562394b685e83ae4a38a93eef43625755a231' 
* commit '4a8562394b685e83ae4a38a93eef43625755a231':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
	configure

No change as the incorrect code wasnt in ffmpegs configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 23:00:55 +01:00
Michael Niedermayer
b73cf4eb15 Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4' 
* commit 'ee17be3fdd37f63f4b77676820e387858908b0f4':
  hevc: Use get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 22:51:49 +01:00
Michael Niedermayer
d79d5aed6d Merge commit '5eacbb53289570834f9a1acb15fd406ea224eef6' 
* commit '5eacbb53289570834f9a1acb15fd406ea224eef6':
  golomb: Add a get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 22:33:32 +01:00
Michael Niedermayer
77e9123fe5 lavf: always use av_free 
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
 2014-03-10 18:02:55 +01:00
Tim Walker
34bbc81de8 lavf: simplify ff_hevc_annexb2mp4_buf 
Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.
 2014-03-10 18:02:36 +01:00
Carl Eugen Hoyos
5968415156 Define ff_log2_run[] in libavcodec/internal.h. 
This avoids defining the array with different sizes in
different source files.
 2014-03-10 13:37:12 +01:00
Carl Eugen Hoyos
d68ac92dc2 Replace an incorrect av_free() in movenc.c with av_freep(). 2014-03-10 13:30:51 +01:00
Michael Niedermayer
27b4d154ca Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Work around broken floating point limits on some systems.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 12:05:02 +01:00
Michael Niedermayer
4c63beeefe Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf' 
* commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf':
  mxfdec: Validate parameters to strftime

Conflicts:
	libavformat/mxfdec.c

See: 423089e964
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 11:51:40 +01:00
Luca Barbato
4a8562394b configure: Use the right pkgconf file for openjpeg 
The current release of version 1 uses libopenjpeg1.
 2014-03-10 11:48:04 +01:00
Luca Barbato
ee17be3fdd hevc: Use get_se_golomb_long 
Do not use inline functions that refer to tables present in other
libraries.
 2014-03-10 10:59:48 +01:00
Luca Barbato
5eacbb5328 golomb: Add a get_se_golomb_long 
Useful in libavformat mostly.
 2014-03-10 10:58:37 +01:00
Anton Khirnov
e854b8f9f4 Work around broken floating point limits on some systems. 
The values of {FLT,DBL}_{MAX,MIN} macros on some systems (older musl
libc, some BSD flavours) are not exactly representable, i.e.
(double)DBL_MAX == DBL_MAX is false
This violates (at least some interpretations of) the C99 standard and
breaks code (e.g. in vf_fps) like
double f = DBL_MAX;
[...]
if (f == DBL_MAX) { // f has not been changed yet
    [....]
}
 2014-03-10 10:27:17 +01:00
Martin Storsjö
8cafeb8bca mxfdec: Validate parameters to strftime 
The MSVCRT version of strftime calls the invalid parameter handler
if the struct values in struct tm are invalid. In case no invalid
parameter handler is set for the process, the process is aborted.

This fixes fate failures on MSVC builds since 570af382.

Based on a patch by Hendrik Leppkes.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-03-10 11:11:08 +02:00
Timothy Gu
53eb4e0799 Add fieldmatch test 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 02:59:01 +01:00
Michael Niedermayer
fb0023639e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:41:02 +01:00
Michael Niedermayer
38aee6408a Merge commit 'a823d0948683bd97dd58556b5740e434166209a8' 
* commit 'a823d0948683bd97dd58556b5740e434166209a8':
  matroskaenc: write private data in hvcC format for HEVC.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:34:17 +01:00
Michael Niedermayer
88c8e4afea avformat/hevc: fix mix of av_malloc() with free() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:27:31 +01:00
Michael Niedermayer
9563e67e07 Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284' 
* commit '4f3db5d3418a24f3b90422e98ad75388052c4284':
  movenc: allow muxing HEVC in MODE_MP4.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:13:37 +01:00
Michael Niedermayer
5d5e2bd862 avformat/hevc: Make return codes consistent and more flexible 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:12:45 +01:00
Michael Niedermayer
a379813cee Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926' 
* commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 23:08:33 +01:00
Michael Niedermayer
cb403b2570 avformat: fix hevcs use of golomb from avformat 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:59:46 +01:00
Michael Niedermayer
1b1d77ae9b Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b' 
* commit '20b40a597cdd4969cf1147d7c7efee2b6232524b':
  movenc: write hvcC tag for HEVC.

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:48:08 +01:00
Michael Niedermayer
ce1ad8d775 Merge commit '1d9014f0b008485eac4c19d5f5e11ede59237167' 
* commit '1d9014f0b008485eac4c19d5f5e11ede59237167':
  movenc: use 'hev1' tag for HEVC in MODE_MOV.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:31:55 +01:00
Michael Niedermayer
7a69ffaf0d Merge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919' 
* commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919':
  riff: add VP9 fourcc

See: eb7f7b797f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:30:58 +01:00
Michael Niedermayer
4aa48e467b Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105' 
* commit 'fb0a988f94c3b8907610172295a7f6bf78c57105':
  riff: IPJ2 decodes with JPEG2000 decoder

See: b18c27def8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:29:17 +01:00
Michael Niedermayer
0cf6b3b5b7 Merge commit '9e71cc81f3655cacf0f91860fba3043f13b64059' 
* commit '9e71cc81f3655cacf0f91860fba3043f13b64059':
  movdec: handle 0x7fff langcode as macintosh per the specs

See: e636aa1a56
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:27:37 +01:00
Michael Niedermayer
858d9947e4 Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354' 
* commit '8a0bc40545a216a49f43db5d9a42a63961333354':
  libspeex: support ZygoAudio (quality 10 mode)

Conflicts:
	libavformat/isom.c

See: e26b066cd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:25:41 +01:00
Michael Niedermayer
9f71e5d39e Merge commit '360022bd3b894cc01ea112b275fa4c8f53881808' 
* commit '360022bd3b894cc01ea112b275fa4c8f53881808':
  isom: lpcm in mov default to big endian

See: 8b3964ecd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:23:55 +01:00
Michael Niedermayer
c68e53f272 Merge commit 'db32f14c3dfd75290b57a086183d6577457beac4' 
* commit 'db32f14c3dfd75290b57a086183d6577457beac4':
  isom: add "MNG" FourCC

See: 8d0ec6e060
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:22:23 +01:00
Michael Niedermayer
76367f453f Merge commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b' 
* commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b':
  isom: Support MPEG-2 video mov files from FPC5

See: 0aded6bf02
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:21:12 +01:00
Michael Niedermayer
d32245e5b1 Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0' 
* commit '31e558fbcfec8fa9fddf564ab8360384706e41c0':
  isom: add "NO16" FourCC

Conflicts:
	libavformat/isom.c

See: 96e2507363
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:15:32 +01:00
Michael Niedermayer
2030b3a4ab Merge commit '6509012398435252979e149ea4a73438d2107600' 
* commit '6509012398435252979e149ea4a73438d2107600':
  isom: add Radius DV YUV FourCCs

See: a489db6cde
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:14:02 +01:00
Michael Niedermayer
6783b3eb76 avformat/isom: remove duplicated line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:12:37 +01:00
Michael Niedermayer
2f41b18696 Merge commit 'eeae858596a5ce5a84797283f590a16add5704f4' 
* commit 'eeae858596a5ce5a84797283f590a16add5704f4':
  isom: Support Sony XAVC in mov

See: 5b9f39860d
See: 6e65e34837
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-09 22:11:08 +01:00