TS mux: fix ebcc69cfb1569a0fcedf10498606b231ae6fcb7c

[vlc] / modules / mux / mpeg / csa.h

diff --git a/modules/mux/mpeg/csa.h b/modules/mux/mpeg/csa.h
index 3d71e61024c2b53327d8d0d517d1270ba7179f9a..2e380e73093a52c6d10c401f4a285670052ab2cc 100644 (file)
--- a/modules/mux/mpeg/csa.h
+++ b/modules/mux/mpeg/csa.h
@@ -6,33 +6,39 @@
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifndef _CSA_H
+#define _CSA_H 1
+
 typedef struct csa_t csa_t;
-#define csa_New     E_(__csa_New)
-#define csa_Delete  E_(__csa_Delete)
-#define csa_SetCW  E_(__csa_SetCW)
-#define csa_Decrypt E_(__csa_decrypt)
-#define csa_Encrypt E_(__csa_encrypt)
+#define csa_New     __csa_New
+#define csa_Delete  __csa_Delete
+#define csa_SetCW  __csa_SetCW
+#define csa_UseKey  __csa_UseKey
+#define csa_Decrypt __csa_decrypt
+#define csa_Encrypt __csa_encrypt
 
-csa_t *csa_New();
+csa_t *csa_New( void );
 void   csa_Delete( csa_t * );
 
-void   csa_SetCW( csa_t *, uint8_t o_ck[8], uint8_t e_ck[8] );
+int    csa_SetCW( vlc_object_t *p_caller, csa_t *c, char *psz_ck, bool odd );
+int    csa_UseKey( vlc_object_t *p_caller, csa_t *, bool use_odd );
 
-void   csa_Decrypt( csa_t *, uint8_t *pkt );
-void   csa_Encrypt( csa_t *, uint8_t *pkt, int b_odd );
+void   csa_Decrypt( csa_t *, uint8_t *pkt, int i_pkt_size );
+void   csa_Encrypt( csa_t *, uint8_t *pkt, int i_pkt_size );
 
+#endif /* _CSA_H */