carrierwave-video 0.5.4 → 0.5.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 4efda64fe5fc3076a571a57adb8933dc58604931
4
+ data.tar.gz: 420cd6253e94fbdbd971b0dc8b6e7644e64c66f7
5
+ SHA512:
6
+ metadata.gz: 419bbd778322c2e4f43f7b09e7c33783205e7b7813b77e59e401c875276f28c577d03a2a631ce4bf54c82355607fd8861983198061eed2cb5048dafc99ce84c3
7
+ data.tar.gz: 7de98e004cd585e3c5c96918c8a46eee7acffff6000659faebb025e077e7b1f714f3b2ec6509274c20576e4a47bcd365fb298c3efd0659d3821799d2db1aafc4
@@ -40,6 +40,9 @@ Resolution passed to ffmpeg:
40
40
  If you want to keep the same resolution:
41
41
  resolution: :same
42
42
 
43
+ If you want to keep the same video bitrate:
44
+ video_bitrate: :same
45
+
43
46
  Watermark:
44
47
  watermark: {
45
48
  path: File.join(Rails.root, "directory", "file.png"),
@@ -1,5 +1,5 @@
1
1
  module Carrierwave
2
2
  module Video
3
- VERSION = "0.5.4"
3
+ VERSION = "0.5.5"
4
4
  end
5
5
  end
@@ -51,6 +51,10 @@ module CarrierWave
51
51
  @options.format_options[:resolution] = file.resolution
52
52
  end
53
53
 
54
+ if opts[:video_bitrate] == :same
55
+ @options.format_options[:video_bitrate] = file.video_bitrate
56
+ end
57
+
54
58
  yield(file, @options.format_options) if block_given?
55
59
 
56
60
  progress = @options.progress(model)
metadata CHANGED
@@ -1,78 +1,69 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: carrierwave-video
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.4
5
- prerelease:
4
+ version: 0.5.5
6
5
  platform: ruby
7
6
  authors:
8
7
  - rheaton
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-11-27 00:00:00.000000000 Z
11
+ date: 2014-02-28 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rspec
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ! '>='
17
+ - - '>='
20
18
  - !ruby/object:Gem::Version
21
19
  version: 2.10.0
22
20
  type: :development
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ! '>='
24
+ - - '>='
28
25
  - !ruby/object:Gem::Version
29
26
  version: 2.10.0
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: rake
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - '>='
36
32
  - !ruby/object:Gem::Version
37
33
  version: '0'
38
34
  type: :development
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - '>='
44
39
  - !ruby/object:Gem::Version
45
40
  version: '0'
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: streamio-ffmpeg
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ! '>='
45
+ - - '>='
52
46
  - !ruby/object:Gem::Version
53
47
  version: '0'
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ! '>='
52
+ - - '>='
60
53
  - !ruby/object:Gem::Version
61
54
  version: '0'
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: carrierwave
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - '>='
68
60
  - !ruby/object:Gem::Version
69
61
  version: '0'
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - '>='
76
67
  - !ruby/object:Gem::Version
77
68
  version: '0'
78
69
  description: Transcodes to html5-friendly videos.
@@ -99,36 +90,29 @@ files:
99
90
  homepage: https://github.com/rheaton/carrierwave-video
100
91
  licenses:
101
92
  - MIT
93
+ metadata: {}
102
94
  post_install_message:
103
95
  rdoc_options: []
104
96
  require_paths:
105
97
  - lib
106
98
  required_ruby_version: !ruby/object:Gem::Requirement
107
- none: false
108
99
  requirements:
109
- - - ! '>='
100
+ - - '>='
110
101
  - !ruby/object:Gem::Version
111
102
  version: '0'
112
- segments:
113
- - 0
114
- hash: -2491521969780735956
115
103
  required_rubygems_version: !ruby/object:Gem::Requirement
116
- none: false
117
104
  requirements:
118
- - - ! '>='
105
+ - - '>='
119
106
  - !ruby/object:Gem::Version
120
107
  version: '0'
121
- segments:
122
- - 0
123
- hash: -2491521969780735956
124
108
  requirements:
125
109
  - ruby, version 1.9 or greater
126
110
  - ffmpeg, version 0.11.1 or greater with libx256, libfaac, libtheora, libvorbid, libvpx
127
111
  enabled
128
112
  rubyforge_project: carrierwave-video
129
- rubygems_version: 1.8.25
113
+ rubygems_version: 2.1.11
130
114
  signing_key:
131
- specification_version: 3
115
+ specification_version: 4
132
116
  summary: Carrierwave extension that uses ffmpeg to transcode videos.
133
117
  test_files:
134
118
  - spec/lib/carrierwave_video_spec.rb