summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorRodeo <[email protected]>2014-02-13 14:57:05 +0000
committerRodeo <[email protected]>2014-02-13 14:57:05 +0000
commit6f48d5275facdfacc236baa86546fa4d1b52cbc7 (patch)
tree6e2c74ce48366cbb7b269f03686046f74b107da3 /win
parenta3a98a1069a7da82d81df49be12699f435632954 (diff)
libhb: write encoding library's name in the Activity Log.
We lost them for some encoders in SVN revision 5586. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6029 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs3
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs3
-rw-r--r--win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs3
3 files changed, 9 insertions, 0 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs
index 305283286..b59c0e2cc 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs
@@ -335,6 +335,7 @@ namespace HandBrake.Interop.HbLib
//int hb_video_encoder_get_from_name(const char *name);
//const char* hb_video_encoder_get_name(int encoder);
//const char* hb_video_encoder_get_short_name(int encoder);
+//const char* hb_video_encoder_get_long_name(int encoder);
//const char* hb_video_encoder_sanitize_name(const char *name);
[DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]
@@ -352,6 +353,7 @@ namespace HandBrake.Interop.HbLib
//int hb_audio_encoder_get_from_name(const char *name);
//const char* hb_audio_encoder_get_name(int encoder);
//const char* hb_audio_encoder_get_short_name(int encoder);
+//const char* hb_audio_encoder_get_long_name(int encoder);
//const char* hb_audio_encoder_sanitize_name(const char *name);
[DllImport("hb.dll", EntryPoint = "hb_audio_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]
@@ -361,6 +363,7 @@ namespace HandBrake.Interop.HbLib
//int hb_container_get_from_extension(const char *extension); // not really a container name
//const char* hb_container_get_name(int format);
//const char* hb_container_get_short_name(int format);
+//const char* hb_container_get_long_name(int format);
//const char* hb_container_get_default_extension(int format);
//const char* hb_container_sanitize_name(const char *name);
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs
index bb3a62f4f..5d2033e19 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs
@@ -19,6 +19,9 @@ namespace HandBrake.Interop.HbLib
public string short_name;
[MarshalAs(UnmanagedType.LPStr)]
+ public string long_name;
+
+ [MarshalAs(UnmanagedType.LPStr)]
public string default_extension;
public int format;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs
index 76fe71a42..13680ff2c 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs
@@ -18,6 +18,9 @@ namespace HandBrake.Interop.HbLib
[MarshalAs(UnmanagedType.LPStr)]
public string short_name;
+ [MarshalAs(UnmanagedType.LPStr)]
+ public string long_name;
+
public int codec;
public int muxers;