casa-mp-base

diff --git modules/codec/avcodec/avcommon.h modules/codec/avcodec/avcommon.h

index f967473b472af234a740accdff5ac30a0ea91a81..e8f0a067f88655018214bba192e9fe9c4aefc167 100644

--- modules/codec/avcodec/avcommon.h

+++ modules/codec/avcodec/avcommon.h

@@ -60,6 +60,20 @@ static inline AVDictionary *vlc_av_get_options(const char *psz_opts)

     return options;

 }

+static inline void vlc_av_get_options_ng(const char *psz_opts, AVDictionary** pp_dict)

+{

+    config_chain_t *cfg = NULL;

+    config_ChainParseOptions(&cfg, psz_opts);

+    while (cfg) {

+        config_chain_t *next = cfg->p_next;

+        av_dict_set(pp_dict, cfg->psz_name, cfg->psz_value, 0);

+        free(cfg->psz_name);

+        free(cfg->psz_value);

+        free(cfg);

+        cfg = next;

+    }

+}

+

 static inline void vlc_init_avutil(vlc_object_t *obj)

 {

     int level = AV_LOG_QUIET;

diff --git modules/codec/avcodec/avcommon_compat.h modules/codec/avcodec/avcommon_compat.h

index 3c66a1e1b30a2ac742adbe40225cc363590c9b98..d3864448b7f059cfc72fc84262e8e728de8a6c0a 100644

--- modules/codec/avcodec/avcommon_compat.h

+++ modules/codec/avcodec/avcommon_compat.h

@@ -2,7 +2,7 @@

  * avcodec.h: decoder and encoder using libavcodec

  *****************************************************************************

  * Copyright (C) 2001-2013 VLC authors and VideoLAN

- * $Id: 3fc14dc163885eb5ac80d955e3159a506f0dcfed $

+ * $Id: 8f9c12081cf8524424d4611822a69a3a16cf1f05 $

  *

  * Authors: Laurent Aimar <fenrir@via.ecp.fr>

  *          Jean-Baptiste Kempf <jb@videolan.org>

@@ -25,6 +25,8 @@

 #ifndef AVCOMMON_COMPAT_H

 #define AVCOMMON_COMPAT_H 1

+#define AVPROVIDER(lib) ((lib##_VERSION_MICRO < 100) ? "libav" : "ffmpeg")

+

 #ifdef HAVE_LIBAVCODEC_AVCODEC_H

 #include <libavcodec/avcodec.h>

@@ -36,447 +38,44 @@

     ( (LIBAVCODEC_VERSION_MICRO <  100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \

       (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )

-#if LIBAVCODEC_VERSION_MAJOR < 54

-#   define AV_PICTURE_TYPE_B        FF_B_TYPE

-#   define AV_PICTURE_TYPE_I        FF_I_TYPE

-#   define AV_PICTURE_TYPE_P        FF_P_TYPE

-

-#   define AV_SAMPLE_FMT_NONE       SAMPLE_FMT_NONE

-#   define AV_SAMPLE_FMT_U8         SAMPLE_FMT_U8

-#   define AV_SAMPLE_FMT_S16        SAMPLE_FMT_S16

-#   define AV_SAMPLE_FMT_S32        SAMPLE_FMT_S32

-#   define AV_SAMPLE_FMT_FLT        SAMPLE_FMT_FLT

-#   define AV_SAMPLE_FMT_DBL        SAMPLE_FMT_DBL

-