Merge remote-tracking branch 'qatar/master'
* qatar/master: ffserver: remove unused variable. Remove unused and outdated TODO file. gitignore: Drop individual .d ignore; it is already covered by a wildcard. lavf: deprecate AVStream.quality. bink: pass Bink version to audio decoder through extradata instead of codec_tag. libpostproc: Remove disabled code. flashsv: improve some comments and fix some wrong ones flashsv: Eliminate redundant variable indirection. flashsv: set reference frame type to full frame flashsv: replace bitstream description by a link to the specification flashsv: convert a debug av_log into av_dlog flashsv: simplify condition flashsv: return more meaningful error values flashsv: cosmetics: break some overly long lines flashsv: cosmetics: drop some unnecessary parentheses swscale: amend documentation to mention use of native depth for scaling. eval: add missing comma to tests. eval: fix memleak. H.264: make loopfilter bS const where applicable Conflicts: libavcodec/binkaudio.c libavformat/bink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -16,8 +16,11 @@ Evaluating '+PI'
|
||||
Evaluating '1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)'
|
||||
'1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)' -> 12.700000
|
||||
|
||||
Evaluating '80G/80Gi1k'
|
||||
'80G/80Gi1k' -> nan
|
||||
Evaluating '80G/80Gi'
|
||||
'80G/80Gi' -> 0.931323
|
||||
|
||||
Evaluating '1k'
|
||||
'1k' -> 1000.000000
|
||||
|
||||
Evaluating '1Gi'
|
||||
'1Gi' -> 1073741824.000000
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
b6acf782a38d313153b68c4ca204fc90 *./tests/data/lavf/lavf.ffm
|
||||
f9bee27ea1b6b83a06b5f9efb0a4ac1f *./tests/data/lavf/lavf.ffm
|
||||
376832 ./tests/data/lavf/lavf.ffm
|
||||
./tests/data/lavf/lavf.ffm CRC=0xf361ed74
|
||||
|
||||
Reference in New Issue
Block a user