packages: php-ffmpeg/tests-metadata-api.patch - fix type cast

glen glen at pld-linux.org
Thu Jan 6 09:23:23 CET 2011


Author: glen                         Date: Thu Jan  6 08:23:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix type cast

---- Files affected:
packages/php-ffmpeg:
   tests-metadata-api.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/php-ffmpeg/tests-metadata-api.patch
diff -u packages/php-ffmpeg/tests-metadata-api.patch:1.1 packages/php-ffmpeg/tests-metadata-api.patch:1.2
--- packages/php-ffmpeg/tests-metadata-api.patch:1.1	Wed Jan  5 20:52:33 2011
+++ packages/php-ffmpeg/tests-metadata-api.patch	Thu Jan  6 09:23:18 2011
@@ -61,7 +61,7 @@
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
 +/* {{{ _php_get_metadata()
 + */
-+static const char* _php_get_metadata_tag(ff_movie_context *ffmovie_ctx, const char *key)
++static char* _php_get_metadata_tag(ff_movie_context *ffmovie_ctx, const char *key)
 +{
 +    // on first access do av_metadata_conv
 +    if (ffmovie_ctx->metadata == NULL) {
@@ -91,7 +91,7 @@
 -    
 +
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
-+    const char *tag = _php_get_metadata_tag(ffmovie_ctx, "comment");
++    char *tag = _php_get_metadata_tag(ffmovie_ctx, "comment");
 +    if (tag && *tag) {
 +        RETURN_STRINGL(tag, strlen(tag), 1);
 +    }
@@ -107,7 +107,7 @@
      GET_MOVIE_RESOURCE(ffmovie_ctx);
  
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
-+    const char *tag = _php_get_metadata_tag(ffmovie_ctx, "title");
++    char *tag = _php_get_metadata_tag(ffmovie_ctx, "title");
 +    if (tag && *tag) {
 +        RETURN_STRINGL(tag, strlen(tag), 1);
 +    }
@@ -123,7 +123,7 @@
      GET_MOVIE_RESOURCE(ffmovie_ctx);
  
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
-+    const char *tag = _php_get_metadata_tag(ffmovie_ctx, "artist");
++    char *tag = _php_get_metadata_tag(ffmovie_ctx, "artist");
 +    if (tag && *tag) {
 +        RETURN_STRINGL(tag, strlen(tag), 1);
 +    }
@@ -139,7 +139,7 @@
      GET_MOVIE_RESOURCE(ffmovie_ctx);
  
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
-+    const char *tag = _php_get_metadata_tag(ffmovie_ctx, "copyright");
++    char *tag = _php_get_metadata_tag(ffmovie_ctx, "copyright");
 +    if (tag && *tag) {
 +        RETURN_STRINGL(tag, strlen(tag), 1);
 +    }
@@ -155,7 +155,7 @@
      GET_MOVIE_RESOURCE(ffmovie_ctx);
  
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
-+    const char *tag = _php_get_metadata_tag(ffmovie_ctx, "album");
++    char *tag = _php_get_metadata_tag(ffmovie_ctx, "album");
 +    if (tag && *tag) {
 +        RETURN_STRINGL(tag, strlen(tag), 1);
 +    }
@@ -171,7 +171,7 @@
      GET_MOVIE_RESOURCE(ffmovie_ctx);
  
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
-+    const char *tag = _php_get_metadata_tag(ffmovie_ctx, "genre");
++    char *tag = _php_get_metadata_tag(ffmovie_ctx, "genre");
 +    if (tag && *tag) {
 +        RETURN_STRINGL(tag, strlen(tag), 1);
 +    }
@@ -187,7 +187,7 @@
      GET_MOVIE_RESOURCE(ffmovie_ctx);
      
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
-+    const char *tag = _php_get_metadata_tag(ffmovie_ctx, "track");
++    char *tag = _php_get_metadata_tag(ffmovie_ctx, "track");
 +    if (tag && *tag) {
 +        RETURN_STRINGL(tag, strlen(tag), 1);
 +    }
@@ -204,7 +204,7 @@
 +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 31, 0)
 +    // "id3v2 tag TYER is not considered in generic format
 +    // ideally "date" should be used here and extract year from it for full compatability
-+    const char *tag = _php_get_metadata_tag(ffmovie_ctx, "TYER");
++    char *tag = _php_get_metadata_tag(ffmovie_ctx, "TYER");
 +    if (tag && *tag) {
 +        RETURN_STRINGL(tag, strlen(tag), 1);
 +    }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-ffmpeg/tests-metadata-api.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list