Skip to content

Commit

Permalink
Release v1.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
toots committed Feb 9, 2023
1 parent da05c0d commit bad0194
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.19.0
version=0.24.1
profile = conventional
break-separators = after
space-around-lists = false
Expand Down
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.1.7 (unreleased)
1.1.7 (2023-02-08)
=====
* Filter `NaN` when converting floats to and from
OCaml in `swresample`.
Expand Down
4 changes: 2 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(lang dune 2.9)
(lang dune 3.6)

(name ffmpeg)
(version 1.1.6)
(version 1.1.7)
(source (github savonet/ocaml-ffmpeg))
(license LGPL-2.1-only)
(authors "The Savonet Team <[email protected]>")
Expand Down
6 changes: 2 additions & 4 deletions ffmpeg-av.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "1.1.6"
version: "1.1.7"
synopsis: "Bindings for the ffmpeg libraries -- top-level helpers"
maintainer: ["Romain Beauxis <[email protected]>"]
authors: ["The Savonet Team <[email protected]>"]
Expand All @@ -11,7 +11,7 @@ depends: [
"conf-pkg-config" {build}
"conf-ffmpeg" {build}
"ocaml" {>= "4.08.0"}
"dune" {>= "2.9"}
"dune" {>= "3.6"}
"dune-configurator" {build}
"ffmpeg-avutil" {= version}
"ffmpeg-avcodec" {= version}
Expand All @@ -29,11 +29,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/savonet/ocaml-ffmpeg.git"
6 changes: 2 additions & 4 deletions ffmpeg-avcodec.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "1.1.6"
version: "1.1.7"
synopsis: "Bindings for the ffmpeg avcodec library"
maintainer: ["Romain Beauxis <[email protected]>"]
authors: ["The Savonet Team <[email protected]>"]
Expand All @@ -11,7 +11,7 @@ depends: [
"conf-pkg-config" {build}
"conf-ffmpeg" {build}
"ocaml" {>= "4.08.0"}
"dune" {>= "2.9"}
"dune" {>= "3.6"}
"dune-configurator" {build}
"ffmpeg-avutil" {= version}
"odoc" {with-doc}
Expand All @@ -28,11 +28,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/savonet/ocaml-ffmpeg.git"
6 changes: 2 additions & 4 deletions ffmpeg-avdevice.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "1.1.6"
version: "1.1.7"
synopsis: "Bindings for the ffmpeg avdevice library"
maintainer: ["Romain Beauxis <[email protected]>"]
authors: ["The Savonet Team <[email protected]>"]
Expand All @@ -11,7 +11,7 @@ depends: [
"conf-pkg-config" {build}
"conf-ffmpeg" {build}
"ocaml" {>= "4.08.0"}
"dune" {>= "2.9"}
"dune" {>= "3.6"}
"dune-configurator" {build}
"ffmpeg-av" {= version}
"odoc" {with-doc}
Expand All @@ -28,11 +28,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/savonet/ocaml-ffmpeg.git"
6 changes: 2 additions & 4 deletions ffmpeg-avfilter.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "1.1.6"
version: "1.1.7"
synopsis: "Bindings for the ffmpeg avfilter library"
maintainer: ["Romain Beauxis <[email protected]>"]
authors: ["The Savonet Team <[email protected]>"]
Expand All @@ -11,7 +11,7 @@ depends: [
"conf-pkg-config" {build}
"conf-ffmpeg" {build}
"ocaml" {>= "4.08.0"}
"dune" {>= "2.9"}
"dune" {>= "3.6"}
"dune-configurator" {build}
"ffmpeg-avutil" {= version}
"odoc" {with-doc}
Expand All @@ -28,11 +28,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/savonet/ocaml-ffmpeg.git"
6 changes: 2 additions & 4 deletions ffmpeg-avutil.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "1.1.6"
version: "1.1.7"
synopsis: "Bindings for the ffmpeg avutil libraries"
maintainer: ["Romain Beauxis <[email protected]>"]
authors: ["The Savonet Team <[email protected]>"]
Expand All @@ -11,7 +11,7 @@ depends: [
"conf-pkg-config" {build}
"conf-ffmpeg" {build}
"ocaml" {>= "4.08.0"}
"dune" {>= "2.9"}
"dune" {>= "3.6"}
"dune-configurator" {build}
"base-threads"
"odoc" {with-doc}
Expand All @@ -28,11 +28,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/savonet/ocaml-ffmpeg.git"
6 changes: 2 additions & 4 deletions ffmpeg-swresample.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "1.1.6"
version: "1.1.7"
synopsis: "Bindings for the ffmpeg swresample library"
maintainer: ["Romain Beauxis <[email protected]>"]
authors: ["The Savonet Team <[email protected]>"]
Expand All @@ -11,7 +11,7 @@ depends: [
"conf-pkg-config" {build}
"conf-ffmpeg" {build}
"ocaml" {>= "4.08.0"}
"dune" {>= "2.9"}
"dune" {>= "3.6"}
"dune-configurator" {build}
"ffmpeg-avutil" {= version}
"ffmpeg-avcodec" {= version}
Expand All @@ -29,11 +29,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/savonet/ocaml-ffmpeg.git"
6 changes: 2 additions & 4 deletions ffmpeg-swscale.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "1.1.6"
version: "1.1.7"
synopsis: "Bindings for the ffmpeg swscale library"
maintainer: ["Romain Beauxis <[email protected]>"]
authors: ["The Savonet Team <[email protected]>"]
Expand All @@ -11,7 +11,7 @@ depends: [
"conf-pkg-config" {build}
"conf-ffmpeg" {build}
"ocaml" {>= "4.08.0"}
"dune" {>= "2.9"}
"dune" {>= "3.6"}
"dune-configurator" {build}
"ffmpeg-avutil" {= version}
"odoc" {with-doc}
Expand All @@ -28,11 +28,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/savonet/ocaml-ffmpeg.git"
6 changes: 2 additions & 4 deletions ffmpeg.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "1.1.6"
version: "1.1.7"
synopsis: "Bindings for the ffmpeg libraries"
maintainer: ["Romain Beauxis <[email protected]>"]
authors: ["The Savonet Team <[email protected]>"]
Expand All @@ -9,7 +9,7 @@ homepage: "https://github.com/savonet/ocaml-ffmpeg"
bug-reports: "https://github.com/savonet/ocaml-ffmpeg/issues"
depends: [
"ocaml" {>= "4.08.0"}
"dune" {>= "2.9"}
"dune" {>= "3.6"}
"ffmpeg-av" {= version}
"ffmpeg-avutil" {= version}
"ffmpeg-avcodec" {= version}
Expand All @@ -28,11 +28,9 @@ build: [
name
"-j"
jobs
"--promote-install-files=false"
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
["dune" "install" "-p" name "--create-install-files" name]
]
dev-repo: "git+https://github.com/savonet/ocaml-ffmpeg.git"
8 changes: 6 additions & 2 deletions gen_code/gen_code.ml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ let translate_enum_lines ?h_oc ?ml_oc lines labels =
"[i][0])return ";
tab_name;
"[i][1];\n}\nFail(\"Could not find C value for %llu in " ^ tab_name
^ ". Do you need to recompile the ffmpeg binding?\", (uint64_t)v);\nreturn -1;\n}";
^ ". Do you need to recompile the ffmpeg binding?\", (uint64_t)v);\n\
return -1;\n\
}";
];

print_c
Expand Down Expand Up @@ -158,7 +160,9 @@ let translate_enum_lines ?h_oc ?ml_oc lines labels =
"[i][1])return ";
tab_name;
"[i][0];\n}\nFail(\"Could not find OCaml value for %llu in " ^ tab_name
^ ". Do you need to recompile the ffmpeg binding?\", (uint64_t)t);\nreturn -1;\n}";
^ ". Do you need to recompile the ffmpeg binding?\", (uint64_t)t);\n\
return -1;\n\
}";
])

let translate_c_values_opt ?h_oc ?ml_oc ~pre_process in_names enums_labels =
Expand Down

0 comments on commit bad0194

Please sign in to comment.