virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
66,771 Commits 37 Branches 400 Tags 460 MiB
c5ca76ad3b
Commit Graph

66771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thilo Borgmann
dd16a0d8cc lavd/avfoundation: Add basic PCM audio support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 02:31:38 +02:00
Michael Niedermayer
d85ebea3f3 avcodec/ac3enc_template: fix out of array read 
Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 20:34:44 +02:00
Michael Niedermayer
5672107ed6 Merge commit '551746680462538bb5ad7adf55fb1248190428ec' 
* commit '551746680462538bb5ad7adf55fb1248190428ec':
  configure: Provide a safe default for unknonw libcs

Conflicts:
	configure

This is not merged as it does not work with musl here, while
our previous solution does.

See: 170e2fd7c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 18:23:39 +02:00
Luca Barbato
5517466804 configure: Provide a safe default for unknonw libcs 
Support musl out of box.

Amend commit 9d2cee52d3 that got
wrongly merged in its stead.
 2014-09-27 18:01:44 +02:00
Clément Bœsch
5ec90c90c6 avcodec/subviewerdec: remove old compat code 2014-09-27 17:55:29 +02:00
Clément Bœsch
180d7f330b avcodec/microdvddec: remove old compat code 2014-09-27 17:55:22 +02:00
Clément Bœsch
71f6275169 avformat/assdec: make sure to free allocated data in case of error 2014-09-27 17:49:49 +02:00
Clément Bœsch
0e6bad1229 avformat/assenc: mux an event header if none are found in extradata 2014-09-27 17:32:14 +02:00
Clément Bœsch
3a6fa38fb1 avformat/assdec: add myself to Copyright 2014-09-27 17:32:14 +02:00
Clément Bœsch
0aa5c5a89e avformat/assdec: reindent after previous commit 2014-09-27 17:32:13 +02:00
Clément Bœsch
9ec52e5533 avformat/assdec: make sure "Comments:" events end up in the header 2014-09-27 17:32:13 +02:00
Clément Bœsch
ff5f5cbb46 avformat/assdec: output ASS packets 
After this the order from the original file is stored through readorder
when doing ffmpeg -i input.ass -c copy output.mkv.

And now that the ASS muxer honors the ReadOrder, extracting the ass back
(without transcoding) restores the original order.
 2014-09-27 17:32:13 +02:00
lvqcl
e58fc44649 avutil/x86/cpu: fix cpuid sub-leaf selection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 13:21:31 +02:00
Michael Niedermayer
233d1acb70 tests/fate/microsoft: add -flags +bitexact to ilaced_twomv 
Should fix fate failure on alpha and pre sse2 x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 13:07:03 +02:00
Christophe Gisquet
f183febcda hevc: remove CodingTree 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 11:50:41 +02:00
Paul B Mahol
bfdf0f078a avfilter/signalstats: add more pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-09-27 07:28:06 +00:00
Michael Niedermayer
2ec4a84dca ffplay: Separate AVFrame from AVSubtitle 
This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 03:54:36 +02:00
Michael Niedermayer
be5dd8aa55 Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088' 
* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
  mpeg12: Always invoke the get_format() callback

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 03:38:48 +02:00
Michael Niedermayer
28b1698a7c Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde' 
* commit 'ce42316321145c435029dc288c2b5f1d48519dde':
  h264: Always invoke the get_format() callback

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 03:21:56 +02:00
Michael Niedermayer
01831fd004 Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2' 
* commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2':
  hwaccel: Call ->get_format again if hwaccel init fails

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 02:42:30 +02:00
Michael Niedermayer
eb1ac04e59 Merge commit '9d2cee52d37c7340f85a5d41110282aac03e6855' 
* commit '9d2cee52d37c7340f85a5d41110282aac03e6855':
  configure: Assume a standard-compliant default libc

See: 170e2fd7c3
Note, the change is not merged to avoid breaking netbsd and others.
once the netbsd (and any other breakages are dealt with the
else based solution could be used and 170e2fd7c3
could then be reverted)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 02:25:31 +02:00
Michael Niedermayer
ac6b5bb834 Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8' 
* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8':
  avconv: Use only audio and video to guess discontinuities

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 02:06:39 +02:00
James Almer
26cd7b1e1a x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2} 
About two times faster than the c wrapper.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-26 20:48:40 -03:00
Michael Niedermayer
b7a5538870 Merge commit '883e98bc25755327565d8ae0f565a6c886f24816' 
* commit '883e98bc25755327565d8ae0f565a6c886f24816':
  probe: Bump the score for mime type matching

Conflicts:
	libavformat/format.c

See: bcac0f4010
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 01:35:46 +02:00
Michael Niedermayer
5a5d454dcc Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004' 
* commit 'd995f0a1550c9148140eab34c7d770e90925c004':
  log: Unbreak no-tty support on 256color terminals

Conflicts:
	libavutil/log.c

No change, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 01:29:24 +02:00
Reynaldo H. Verdejo Pinochet
a9ea79bb49 libavfilter/af_amix: avoid derreferencing possible null 
ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241516

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-26 18:42:39 -03:00
Reynaldo H. Verdejo Pinochet
32288234a2 libavfilter/af_channelmap: avoid derreferencing possible null 
ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241517

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-26 18:42:39 -03:00
Reynaldo H. Verdejo Pinochet
e3e051c42c libavfilter/af_join: avoid derreferencing possible null 
ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241518

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-26 18:42:39 -03:00
Michael Niedermayer
7618d360ca Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6' 
* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
  flac: Remove unused headers

Conflicts:
	libavcodec/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 22:33:28 +02:00
Michael Niedermayer
c895fa7f66 Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc' 
* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
  ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 22:18:12 +02:00
Michael Niedermayer
15fda8bcf1 Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6' 
* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
  ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 22:07:35 +02:00
Michael Niedermayer
b7caf89401 Merge commit 'b39ebcddd47daf37659796aaa7d068668086507a' 
* commit 'b39ebcddd47daf37659796aaa7d068668086507a':
  fate: Add VC-1 interlaced twomv test

Note, this test is not free of artifacts on both sides of the merge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 21:48:53 +02:00
Rémi Denis-Courmont
4e03b2097c mpeg12: Always invoke the get_format() callback 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-09-26 21:28:37 +02:00
Rémi Denis-Courmont
ce42316321 h264: Always invoke the get_format() callback 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-09-26 21:28:37 +02:00
Rémi Denis-Courmont
1c80c9d7ef hwaccel: Call ->get_format again if hwaccel init fails 
This allows the application to fall back on another hwaccel or,
more likely, software decoding.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-09-26 21:28:36 +02:00
Luca Barbato
9d2cee52d3 configure: Assume a standard-compliant default libc 
Non-standard compliant libc should be supported on a per-case basis
anyway.
 2014-09-26 20:56:16 +02:00
Luca Barbato
6cfbe1de5a avconv: Use only audio and video to guess discontinuities 
Data and subtitle streams might cause false positive.
 2014-09-26 20:56:16 +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
Luca Barbato
d995f0a155 log: Unbreak no-tty support on 256color terminals 2014-09-26 20:56:16 +02:00
Michael Niedermayer
ecf5526578 Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab' 
* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
  vc1: Use logical instead of bitwise or for twomv

See: 1e2ab98460
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 20:55:00 +02:00
Michael Niedermayer
bde8eb7fa3 Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c' 
* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
  vc1: Use logical instead of bitwise or for coded_inter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 20:47:43 +02:00
Tristan Matthews
7703995a2e flac: Remove unused headers 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-26 10:33:01 -07:00
Tim Walker
cc4992aaf3 ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode. 
This is actually defined in the A/52 specification.
 2014-09-26 17:09:14 +02:00
Tim Walker
4c2fd4b262 ac3enc: allow Dolby Pro Logic II as a preferred downmix mode. 
Some encoders already use this value even
though it's reserved in the A/52 specification.
 2014-09-26 17:09:13 +02:00
Tim Walker
b39ebcddd4 fate: Add VC-1 interlaced twomv test 
CC: libav-stable@libav.org
 2014-09-26 16:55:59 +02:00
Michael Niedermayer
a97328afef vc1: Use logical instead of bitwise or for twomv 
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
 2014-09-26 16:55:36 +02:00
Tim Walker
b5fe13448b vc1: Use logical instead of bitwise or for coded_inter 
This appears to be the intended behavior.
 2014-09-26 16:18:42 +02:00
Peter Ross
1964251be7 libavformat/iff: print error message when DSDIFF compression type is not supported 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 12:51:40 +02:00
Michael Niedermayer
ee2e5acdb1 avcodec/dxtory: remove unused variables 
Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 12:51:40 +02:00
Michael Niedermayer
4c57be124f Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37' 
* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
  pcm-dvd: Move a variable to a smaller scope

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 12:30:02 +02:00