openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-28 05:30:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,491 Commits 179 Branches 45 Tags 239 MiB
5a5d454dcc
Commit Graph

66491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michael Niedermayer
b0458e62c8 Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2' 
* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
  caf: Give context structure a consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 12:24:00 +02:00
Thilo Borgmann
f2254e36c0 lavd/avfoundation: Use microseconds as common timebase. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 12:13:57 +02:00
Diego Biurrun
b97f6ef956 pcm-dvd: Move a variable to a smaller scope 
This avoids an unused variable warning on big-endian systems.
 2014-09-26 02:15:34 -07:00
Clément Bœsch
9ae83ece8a avformat/srtdec: simpler and more lenient probing 
Fixes Ticket #3935.
 2014-09-26 11:12:41 +02:00
wm4
7dd2005e1a avformat: add SUP/PGS subtitle demuxer 
Signed-off-by: Clément Bœsch <u@pkh.me>
 2014-09-26 10:35:14 +02:00
Diego Biurrun
4d5b99dacd caf: Give context structure a consistent name 2014-09-26 00:44:41 -07:00
Thilo Borgmann
1ea7a3e04e lavd/avfoundation: Simplify debug message generation. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 05:05:31 +02:00
Thilo Borgmann
92827e1869 lavd/avfoundation: Using the actual stream index instead of hardcoded value. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 05:05:11 +02:00
Thilo Borgmann
a69c70e148 lavd/avfoundation: Split adding a device and getting the device configuration into separate functions. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-26 04:18:24 +02:00
Carl Eugen Hoyos
88c937fdc8 Autodetect jpg images. 
Based on 2d3842f5 by Michael Niedermayer.

Fixes ticket #2541.
 2014-09-26 00:06:41 +02:00
Carl Eugen Hoyos
475e3799cd Support libopenjpeg 2.x via libopenmj2. 
Based on a patch by Marius Cirsta.

Fixes ticket #2016.
 2014-09-26 00:06:41 +02:00
Carl Eugen Hoyos
8de7bdd756 Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P. 2014-09-26 00:06:41 +02:00
Michael Niedermayer
a43bcaafe2 avcodec/dxtory: Support dxtory-2.0.127.avi 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 23:46:56 +02:00
Carl Eugen Hoyos
c0f9df30dd lavc/x86/idctdsp.h: Fix make checkheaders. 2014-09-25 22:18:25 +02:00
James Almer
a829870b2f avcodec/svq1enc: align buffer used by simd functions 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-25 16:00:20 -03:00
James Almer
4b892e469b x86/cavsdsp: fix buffer alignment in cavs_idct8_add_mmx() 
It may be used by ff_add_pixels_clamped_sse2().
Should fix fate-cavs failures on some systems.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-25 16:00:16 -03:00
Thilo Borgmann
e113692c89 lavu/ffmpeg_opt: Check return value of avcodec_find_encoder(). 
Prevents a segfault if a stream featuring a known but unavailable codec (like external lib codec) should be opened.

Bug found by: Jonas Geistert <j.geistert@yahoo.de>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 18:03:09 +02:00
Michael Niedermayer
ce6e46be72 avformat/img2dec: enable generic seeking for image pipes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 17:47:45 +02:00
Michael Niedermayer
6d35aba167 avformat/img2dec: initialize pkt->pos for image pipes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 17:16:14 +02:00
Michael Niedermayer
2497914a18 avformat/img2dec: pass error code and signal EOF 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 16:20:23 +02:00
Michael Niedermayer
1dbdcb4a8c avformat/img2dec: fix error code at EOF for pipes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 15:22:42 +02:00
Michael Niedermayer
454f98b881 Merge commit '4620affa24eedb167482198aa04126bcedd05620' 
* commit '4620affa24eedb167482198aa04126bcedd05620':
  m4vdec: K&R formatting cosmetics

Conflicts:
	libavformat/m4vdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 14:02:55 +02:00
Michael Niedermayer
59f4966756 Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5' 
* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
  lmlm4: K&R formatting cosmetics

Conflicts:
	libavformat/lmlm4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 13:51:43 +02:00
Michael Niedermayer
8f3d3e5f83 Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b' 
* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
  concat: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 13:45:30 +02:00
Michael Niedermayer
9b53691f73 Merge commit '28f5cd312c9da9072108edf8b7685d009374ea96' 
* commit '28f5cd312c9da9072108edf8b7685d009374ea96':
  fate: Switch ra4-288 test from framecrc() to pcm()

Conflicts:
	tests/fate/real.mak

The test is kept disabled as it still does not pass on x86-64 due to float
rounding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 13:37:40 +02:00
Michael Niedermayer
a6fd685fed Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d' 
* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
  avcodec: Fix a doxy comment to refer to the right function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-25 12:09:32 +02:00
Gabriel Dume
4620affa24 m4vdec: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-25 01:58:51 -07:00
Gabriel Dume
86a361081d lmlm4: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-25 01:44:32 -07:00
Gabriel Dume
95d312d6c8 concat: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-25 01:44:31 -07:00
Katerina Barone-Adesi
28f5cd312c fate: Switch ra4-288 test from framecrc() to pcm() 
The decoder is float-based and the test needs to allow for some fuzz.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-25 01:44:31 -07:00