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
73,018 Commits 37 Branches 400 Tags 464 MiB
7e2bdea764
Commit Graph

73018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhang Rui
c886dd2f58 avformat/mov: check result of avio_seek 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 18:48:18 +02:00
Michael Niedermayer
18833daf9d ffmpeg: Support copying unknown streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 18:21:38 +02:00
周晓勇
33e9473366 avcodec/mips: loongson fix bugs in mathops optimization 
the incorrect UMULH, ff_sqrt, MAC64 and MLS64 to be optimized later, delete them just for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 17:46:33 +02:00
Michael Niedermayer
818275bbd0 avutil/pixfmt: s/luma sample positions/horizontal luma sample positions/ 
Better to be explicit before someone thinks this could be the time axis ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 12:48:16 +02:00
Michael Niedermayer
8a141ad5e8 avutil/pixfmt: make luma sample positions even more explicit in the AVChromaLocation ASCII art 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 12:44:23 +02:00
Michael Niedermayer
b95df4c371 avutil/pixfmt: Clarify mpeg example comments for AVChromaLocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 12:40:29 +02:00
Michael Niedermayer
acccc28713 avutil/pixfmt: clarify chroma location text further, as "first" is ambigous 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 12:35:22 +02:00
Michael Niedermayer
a3b0130dee avutil/pixfmt: Clarify that the ASCII art describes the location of the first chroma sample of AVChromaLocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 12:30:46 +02:00
Michael Niedermayer
0b9d636877 ffmpeg_opt: add missing space in error message 
Found-by: rcombs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 01:47:50 +02:00
Michael Niedermayer
737b0ca65b Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavc/qdrw: Do not fail decoding valid Quickdraw images.
  lavf/mov: Use AVCOL_SPC constants when checking color_space.
  lavf/mov: Write colour matrix "6" for color_space bt470bg.
  lavf/mkv: Only skip prores header if the packet is large enough.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 01:26:36 +02:00
Michael Niedermayer
592b053c7b ffmpeg_opt: fix the error message log level for the unsupported stream types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 01:10:53 +02:00
Michael Niedermayer
100df10b0f ffmpeg_opt: Give the user a hint on how to ignore unsupported streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 01:10:53 +02:00
James Almer
40bf3687a1 libvpx: add support for yuv440p and yuv440p10/12 encoding 
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-05-20 20:08:56 -03:00
Carl Eugen Hoyos
209e91cbc4 lavc/qdrw: Do not fail decoding valid Quickdraw images. 2015-05-21 01:05:13 +02:00
Carl Eugen Hoyos
4fb3efd2c1 lavf/mov: Use AVCOL_SPC constants when checking color_space. 
Suggested-by: Ronald Bultje
 2015-05-21 01:04:57 +02:00
Carl Eugen Hoyos
c4f864193f lavf/mov: Write colour matrix "6" for color_space bt470bg. 
This matches the demuxer's behaviour.
 2015-05-21 01:04:45 +02:00
Rodger Combs
a2aff2690b ffmpeg: support ignoring unsupported mapped streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-21 00:52:06 +02:00
Carl Eugen Hoyos
8f6b919d99 lavf/mkv: Only skip prores header if the packet is large enough. 
Fixes a possible endless loop.
 2015-05-21 00:43:38 +02:00
Michael Niedermayer
642355712b Merge commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1' 
* commit '3efe0393e4f0eaa27bac8833edbd7d3cff4704e1':
  hevc: make avcodec_decode_video2() fail if get_format() fails

Conflicts:
	libavcodec/hevc.c

See: cc5e4bb484
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 21:40:05 +02:00
Andreas Cadhalpun
bb23a15df5 nutdec: abort if EOF is reached in decode_info_header/read_sm_data 
These loops can take a lot of time if count is very large.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-20 20:43:54 +02:00
Vittorio Giovara
265d884eb0 avcodec/vmnc: Add back adapted comment about 24bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 19:24:54 +02:00
Michael Niedermayer
6b783d2ace Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512' 
* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
  lavfi: Move avcodec header to the only filter needing it

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 19:14:11 +02:00
Andreas Cadhalpun
fa7dec8cb0 nutdec: stop skipping bytes at EOF 
This can unnecessarily waste a lot of time.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-20 19:07:26 +02:00
Andreas Cadhalpun
37e679881d nutdec: fix infinite resync loops 
nut->last_syncpoint_pos doesn't necessarily change between resync
attempts, so find_any_startcode can return the same startcode again.

Thus remember where the last resync happened and don't try to resync
before that.

This can't be done locally in nut_read_packet, because this wouldn't
prevent infinite resync loops, where after the resync a packet is
returned and while reading a following packet the resync happens again.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2015-05-20 19:07:26 +02:00
Michael Niedermayer
b6ca7bfc7c avcodec/vmnc: Simplify "24bit" support 
This also makes the code more robust, removing potential out of
array writes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 18:50:38 +02:00
Michael Niedermayer
a4c7aeaf82 Merge commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d' 
* commit 'eafbc6716cede6d4a652f8bedf82f2901c68d06d':
  vmnc: Delay pixel size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 18:41:43 +02:00
Michael Niedermayer
6d1935d1b9 avcodec/hevc: Remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 18:15:22 +02:00
周晓勇
f9d05786a8 configure: add cpuflags for loongson3 series cpu 
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 17:57:59 +02:00
Michael Niedermayer
b3496b4a33 avformat/nutdec: Fix recovery when immedeately after seeking a failure happens 
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 17:48:28 +02:00
Michael Niedermayer
6bbb2f8f4d avformat/nutdec: Return error on EOF from get_str() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 17:20:58 +02:00
Michael Niedermayer
611e1085f8 fate: Add fate-mathops test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 15:50:58 +02:00
Michael Niedermayer
50965e0673 avcodec: add mathops test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 15:50:58 +02:00
Carl Eugen Hoyos
eb0c08bc69 lavc/vmnc: Fix 32bit colour-space, there is no transparency. 2015-05-20 14:59:38 +02:00
周晓勇
0d41f1ffbc configure: disable mipsfpu for loongson3 
MIPSFPU optimization does't support FATE correctly on Loongson-3.

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 12:24:59 +02:00
Michael Niedermayer
886ba93009 doc/encoders: add flac 
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 12:09:46 +02:00
Niklesh
b44a55ad2d Fix movtext crashes caused due to lack of proper bounds checking 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-05-19 20:15:15 -07:00
Michael Niedermayer
b8e7f2b277 avcodec/flacenc: Support Multi dimensional quantization 
Now with exact bit computations if exact_rice_parameters is enabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-20 01:35:29 +02:00
wm4
3efe0393e4 hevc: make avcodec_decode_video2() fail if get_format() fails 
Personally, I need the decoder to back out if get_format() returns no
usable pixel format. This didn't work because the error code was not
propagated down the call chain. This in turn happened because the
variable declaration removed in this patch shadowed the variable, whose
value is returned at the end of the function. Consequently, failures of
decode_nal_unit() were ignored in this place.

Reviewed-by:  Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 18:59:06 +01:00
Vittorio Giovara
7046bd9bc9 lavfi: Move avcodec header to the only filter needing it 
af_ashowinfo, due to the enum AVAudioServiceType use.
 2015-05-19 18:56:40 +01:00
Vittorio Giovara
eafbc6716c vmnc: Delay pixel size check 
Some clients incorrectly set 24 as bits_per_coded_sample, while
the actual value is preserved in one of the codec headers.
In order to work around this, delay the check until decode_frame().

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-05-19 18:55:30 +01:00
Michael Niedermayer
215410860f avcodec/flacenc: Mark pointers/array arguments const which are not changed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 19:47:22 +02:00
Michael Niedermayer
5dfcb4f74d avcodec/flacenc: Simplify md5 calculation code by using AV_WL24() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 19:41:44 +02:00
Michael Niedermayer
710abaf2c5 avutil/pixfmt: Improve ascii art showing the meaning of the AVChromaLocation values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 17:47:28 +02:00
Michael Niedermayer
7786a91b47 avcodec/flacenc: Move udata and sums to FlacSubframe 
This significantly reduces the amount of stack space needed and
also permits to simply copy the rice context again without speed
penalty

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 13:48:30 +02:00
Michael Niedermayer
df5e408d32 fate: Add test for -exact_rice_parameters 1 2015-05-19 13:43:18 +02:00
Michael Niedermayer
80f9d6e0ab avcodec/flacenc: Support calculating rice parameters exactly 
Some files benefit by about 0.3% from this, and speedwise its ok
other files do not benefit and encode to the same size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 13:42:56 +02:00
Michael Niedermayer
d3dcd28812 avcodec/flacenc: Do not copy unused udata array -> 5x faster calc_rice_params() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 12:11:27 +02:00
Michael Niedermayer
d0ac2f59aa avcodec/golomb: Remove disabled and broken code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 03:25:53 +02:00
Michael Niedermayer
8ea9334b31 avcodec/mss2: use < 0 instead of != 0 to check for error of vlc initialization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-19 03:25:53 +02:00
Michael Niedermayer
b0322e4a9e ffmpeg_opt: Compensate for DTS/PTS difference in seeking when its based on DTS 
Fixes Ticket4554

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-18 21:16:36 +02:00