diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/avcodec.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/avcodec.h
index 90abdb2e..fe64b389 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/avcodec.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/avcodec.h
@@ -37,10 +37,6 @@
 #include "libavutil/dict.h"
 #include "libavutil/frame.h"
 #include "libavutil/log.h"
-#if FF_API_FAST_MALLOC
-// to provide fast_*alloc
-#include "libavutil/mem.h"
-#endif
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
@@ -109,9 +105,7 @@ enum AVCodecID {
     /* video codecs */
     AV_CODEC_ID_MPEG1VIDEO,
     AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
     AV_CODEC_ID_MPEG2VIDEO_XVMC,
-#endif /* FF_API_XVMC */
     AV_CODEC_ID_H261,
     AV_CODEC_ID_H263,
     AV_CODEC_ID_RV10,
@@ -282,8 +276,6 @@ enum AVCodecID {
     AV_CODEC_ID_ESCAPE130_DEPRECATED,
     AV_CODEC_ID_G2M_DEPRECATED,
     AV_CODEC_ID_WEBP_DEPRECATED,
-    AV_CODEC_ID_HNM4_VIDEO,
-    AV_CODEC_ID_HEVC_DEPRECATED,
 
     AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
     AV_CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
@@ -634,26 +626,16 @@ enum AVColorPrimaries{
     AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
     AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
     AVCOL_PRI_FILM        = 8,
-    AVCOL_PRI_BT2020      = 9, ///< ITU-R BT2020
     AVCOL_PRI_NB             , ///< Not part of ABI
 };
 
 enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709        =  1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED  =  2,
-    AVCOL_TRC_GAMMA22      =  4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28      =  5, ///< also ITU-R BT470BG
-    AVCOL_TRC_SMPTE170M    =  6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
-    AVCOL_TRC_SMPTE240M    =  7,
-    AVCOL_TRC_LINEAR       =  8, ///< "Linear transfer characteristics"
-    AVCOL_TRC_LOG          =  9, ///< "Logarithmic transfer characteristic (100:1 range)"
-    AVCOL_TRC_LOG_SQRT     = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt( 10 ) : 1 range)"
-    AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
-    AVCOL_TRC_BT1361_ECG   = 12, ///< ITU-R BT1361 Extended Colour Gamut
-    AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
-    AVCOL_TRC_BT2020_10    = 14, ///< ITU-R BT2020 for 10 bit system
-    AVCOL_TRC_BT2020_12    = 15, ///< ITU-R BT2020 for 12 bit system
-    AVCOL_TRC_NB               , ///< Not part of ABI
+    AVCOL_TRC_BT709       = 1, ///< also ITU-R BT1361
+    AVCOL_TRC_UNSPECIFIED = 2,
+    AVCOL_TRC_GAMMA22     = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_TRC_GAMMA28     = 5, ///< also ITU-R BT470BG
+    AVCOL_TRC_SMPTE240M   = 7,
+    AVCOL_TRC_NB             , ///< Not part of ABI
 };
 
 /**
@@ -695,12 +677,7 @@ typedef struct RcOverride{
     float quality_factor;
 } RcOverride;
 
-#if FF_API_MAX_BFRAMES
-/**
- * @deprecated there is no libavcodec-wide limit on the number of B-frames
- */
 #define FF_MAX_B_FRAMES 16
-#endif
 
 /* encoding support
    These flags can be passed in AVCodecContext.flags before initialization.
@@ -714,7 +691,6 @@ typedef struct RcOverride{
 #define CODEC_FLAG_UNALIGNED 0x0001
 #define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
 #define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
 #define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
 #define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
 #define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
@@ -765,10 +741,8 @@ typedef struct RcOverride{
  */
 #define CODEC_CAP_DR1             0x0002
 #define CODEC_CAP_TRUNCATED       0x0008
-#if FF_API_XVMC
 /* Codec can export data for HW decoding (XvMC). */
 #define CODEC_CAP_HWACCEL         0x0010
-#endif /* FF_API_XVMC */
 /**
  * Encoder or decoder requires flushing with NULL input at the end in order to
  * give the complete and correct output.
@@ -825,12 +799,12 @@ typedef struct RcOverride{
  * Codec should fill in channel configuration and samplerate instead of container
  */
 #define CODEC_CAP_CHANNEL_CONF     0x0400
-#if FF_API_NEG_LINESIZES
+
 /**
- * @deprecated no codecs use this capability
+ * Codec is able to deal with negative linesizes
  */
 #define CODEC_CAP_NEG_LINESIZES    0x0800
-#endif
+
 /**
  * Codec supports frame-level multithreading.
  */
@@ -860,7 +834,6 @@ typedef struct RcOverride{
  */
 #define CODEC_CAP_LOSSLESS         0x80000000
 
-#if FF_API_MB_TYPE
 //The following defines may change, don't expect compatibility if you use them.
 #define MB_TYPE_INTRA4x4   0x0001
 #define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
@@ -884,7 +857,6 @@ typedef struct RcOverride{
 #define MB_TYPE_QUANT      0x00010000
 #define MB_TYPE_CBP        0x00020000
 //Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-#endif
 
 /**
  * Pan Scan area.
@@ -915,12 +887,10 @@ typedef struct AVPanScan{
     int16_t position[3][2];
 }AVPanScan;
 
-#if FF_API_QSCALE_TYPE
 #define FF_QSCALE_TYPE_MPEG1 0
 #define FF_QSCALE_TYPE_MPEG2 1
 #define FF_QSCALE_TYPE_H264  2
 #define FF_QSCALE_TYPE_VP56  3
-#endif
 
 #if FF_API_GET_BUFFER
 #define FF_BUFFER_TYPE_INTERNAL 1
@@ -1353,9 +1323,7 @@ typedef struct AVCodecContext {
      */
     int coded_width, coded_height;
 
-#if FF_API_ASPECT_EXTENDED
 #define FF_ASPECT_EXTENDED 15
-#endif
 
     /**
      * the number of pictures in a group of pictures, or 0 for intra_only
@@ -1682,15 +1650,12 @@ typedef struct AVCodecContext {
 #define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
 #define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
 
-#if FF_API_XVMC
     /**
      * XVideo Motion Acceleration
      * - encoding: forbidden
      * - decoding: set by decoder
-     * @deprecated XvMC support is slated for removal.
      */
-    attribute_deprecated int xvmc_acceleration;
-#endif /* FF_API_XVMC */
+    int xvmc_acceleration;
 
     /**
      * macroblock decision mode
@@ -2425,16 +2390,12 @@ typedef struct AVCodecContext {
      */
     int workaround_bugs;
 #define FF_BUG_AUTODETECT       1  ///< autodetection
-#if FF_API_OLD_MSMPEG4
 #define FF_BUG_OLD_MSMPEG4      2
-#endif
 #define FF_BUG_XVID_ILACE       4
 #define FF_BUG_UMP4             8
 #define FF_BUG_NO_PADDING       16
 #define FF_BUG_AMV              32
-#if FF_API_AC_VLC
 #define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#endif
 #define FF_BUG_QPEL_CHROMA      64
 #define FF_BUG_STD_QPEL         128
 #define FF_BUG_QPEL_CHROMA2     256
@@ -2484,12 +2445,7 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_BITSTREAM   4
 #define FF_DEBUG_MB_TYPE     8
 #define FF_DEBUG_QP          16
-#if FF_API_DEBUG_MV
-/**
- * @deprecated this option does nothing
- */
 #define FF_DEBUG_MV          32
-#endif
 #define FF_DEBUG_DCT_COEFF   0x00000040
 #define FF_DEBUG_SKIP        0x00000080
 #define FF_DEBUG_STARTCODE   0x00000100
@@ -2497,17 +2453,13 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_ER          0x00000400
 #define FF_DEBUG_MMCO        0x00000800
 #define FF_DEBUG_BUGS        0x00001000
-#if FF_API_DEBUG_MV
-#define FF_DEBUG_VIS_QP      0x00002000 ///< only access through AVOptions from outside libavcodec
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec
-#endif
+#define FF_DEBUG_VIS_QP      0x00002000
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
 #define FF_DEBUG_BUFFERS     0x00008000
 #define FF_DEBUG_THREADS     0x00010000
 
-#if FF_API_DEBUG_MV
     /**
      * debug
-     * Code outside libavcodec should access this field using AVOptions
      * - encoding: Set by user.
      * - decoding: Set by user.
      */
@@ -2515,7 +2467,6 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
 #define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
 #define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-#endif
 
     /**
      * Error recognition; may misdetect some more or less valid parts as errors.
@@ -2523,14 +2474,7 @@ typedef struct AVCodecContext {
      * - decoding: Set by user.
      */
     int err_recognition;
-
-/**
- * Verify checksums embedded in the bitstream (could be of either encoded or
- * decoded data, depending on the codec) and print an error message on mismatch.
- * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
- * decoder returning an error.
- */
-#define AV_EF_CRCCHECK  (1<<0)
+#define AV_EF_CRCCHECK  (1<<0)          ///< verify embedded CRCs
 #define AV_EF_BITSTREAM (1<<1)          ///< detect bitstream specification deviations
 #define AV_EF_BUFFER    (1<<2)          ///< detect improper bitstream length
 #define AV_EF_EXPLODE   (1<<3)          ///< abort decoding on minor error detection
@@ -2609,9 +2553,7 @@ typedef struct AVCodecContext {
 #define FF_IDCT_SIMPLEVIS     18
 #define FF_IDCT_FAAN          20
 #define FF_IDCT_SIMPLENEON    22
-#if FF_API_ARCH_ALPHA
 #define FF_IDCT_SIMPLEALPHA   23
-#endif
 
     /**
      * bits per sample/pixel from the demuxer (needed for huffyuv).
@@ -2641,7 +2583,7 @@ typedef struct AVCodecContext {
     /**
      * the picture in the bitstream
      * - encoding: Set by libavcodec.
-     * - decoding: unused
+     * - decoding: Set by libavcodec.
      */
     AVFrame *coded_frame;
 
@@ -2713,13 +2655,13 @@ typedef struct AVCodecContext {
      */
     int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
 
-#if FF_API_THREAD_OPAQUE
     /**
-     * @deprecated this field should not be used from outside of lavc
+     * thread opaque
+     * Can be used by execute() to store some per AVCodecContext stuff.
+     * - encoding: set by execute()
+     * - decoding: set by execute()
      */
-    attribute_deprecated
     void *thread_opaque;
-#endif
 
     /**
      * noise vs. sse weight for the nsse comparsion function
@@ -2846,22 +2788,21 @@ typedef struct AVCodecContext {
     uint8_t *subtitle_header;
     int subtitle_header_size;
 
-#if FF_API_ERROR_RATE
     /**
-     * @deprecated use the 'error_rate' private AVOption of the mpegvideo
-     * encoders
+     * Simulates errors in the bitstream to test error concealment.
+     * - encoding: Set by user.
+     * - decoding: unused
      */
-    attribute_deprecated
     int error_rate;
-#endif
 
-#if FF_API_CODEC_PKT
     /**
-     * @deprecated this field is not supposed to be accessed from outside lavc
+     * Current packet as passed into the decoder, to avoid having
+     * to pass the packet into every function. Currently only valid
+     * inside lavc and get/release_buffer callbacks.
+     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
+     * - encoding: unused
      */
-    attribute_deprecated
     AVPacket *pkt;
-#endif
 
     /**
      * VBV delay coded in the last frame (in periods of a 27 MHz clock).
@@ -2949,19 +2890,6 @@ typedef struct AVCodecContext {
      * - encoding: set by libavcodec
      */
     int seek_preroll;
-
-#if !FF_API_DEBUG_MV
-    /**
-     * debug motion vectors
-     * Code outside libavcodec should access this field using AVOptions
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-#endif
 } AVCodecContext;
 
 AVRational av_codec_get_pkt_timebase         (const AVCodecContext *avctx);
@@ -3298,6 +3226,40 @@ void avcodec_register(AVCodec *codec);
  */
 void avcodec_register_all(void);
 
+
+#if FF_API_ALLOC_CONTEXT
+/**
+ * Allocate an AVCodecContext and set its fields to default values.  The
+ * resulting struct can be deallocated by simply calling av_free().
+ *
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
+ *
+ * @deprecated use avcodec_alloc_context3()
+ */
+attribute_deprecated
+AVCodecContext *avcodec_alloc_context(void);
+
+/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
+ *  we WILL change its arguments and name a few times! */
+attribute_deprecated
+AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
+
+/**
+ * Set the fields of the given AVCodecContext to default values.
+ *
+ * @param s The AVCodecContext of which the fields should be set to default values.
+ * @deprecated use avcodec_get_context_defaults3
+ */
+attribute_deprecated
+void avcodec_get_context_defaults(AVCodecContext *s);
+
+/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
+ *  we WILL change its arguments and name a few times! */
+attribute_deprecated
+void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
+#endif
+
 /**
  * Allocate an AVCodecContext and set its fields to default values.  The
  * resulting struct can be deallocated by calling avcodec_close() on it followed
@@ -3363,13 +3325,14 @@ const AVClass *avcodec_get_subtitle_rect_class(void);
  */
 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
 
-#if FF_API_AVFRAME_LAVC
 /**
- * @deprecated use av_frame_alloc()
+ * Allocate an AVFrame and set its fields to default values.  The resulting
+ * struct must be freed using avcodec_free_frame().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ * @see avcodec_get_frame_defaults
  */
-attribute_deprecated
 AVFrame *avcodec_alloc_frame(void);
-#endif
 
 /**
  * Set the fields of the given AVFrame to default values.
@@ -3390,6 +3353,40 @@ void avcodec_get_frame_defaults(AVFrame *frame);
  */
 void avcodec_free_frame(AVFrame **frame);
 
+#if FF_API_AVCODEC_OPEN
+/**
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated.
+ *
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
+ *
+ * @warning This function is not thread safe!
+ *
+ * @code
+ * avcodec_register_all();
+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+ * if (!codec)
+ *     exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open(context, codec) < 0)
+ *     exit(1);
+ * @endcode
+ *
+ * @param avctx The context which will be set up to use the given codec.
+ * @param codec The codec to use within the context.
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3, avcodec_find_decoder, avcodec_find_encoder, avcodec_close
+ *
+ * @deprecated use avcodec_open2
+ */
+attribute_deprecated
+int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+#endif
+
 /**
  * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
  * function the context has to be allocated with avcodec_alloc_context3().
@@ -4669,13 +4666,7 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en
  * @}
  */
 
-#if FF_API_SET_DIMENSIONS
-/**
- * @deprecated this function is not supposed to be used from outside of lavc
- */
-attribute_deprecated
 void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-#endif
 
 /**
  * Put a string representing the codec tag codec_tag in buf.
@@ -4871,6 +4862,27 @@ AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
 
 /* memory */
 
+/**
+ * Reallocate the given block if it is not large enough, otherwise do nothing.
+ *
+ * @see av_realloc
+ */
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Allocate a buffer, reusing the given one if large enough.
+ *
+ * Contrary to av_fast_realloc the current buffer contents might not be
+ * preserved and on error the old buffer is freed, thus no special
+ * handling to avoid memleaks is necessary.
+ *
+ * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
+ * @param size size of the buffer *ptr points to
+ * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
+ *                 *size 0 if an error occurred.
+ */
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+
 /**
  * Same behaviour av_fast_malloc but the buffer has additional
  * FF_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/old_codec_ids.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/old_codec_ids.h
index b956264f..d8a8f746 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/old_codec_ids.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/old_codec_ids.h
@@ -34,9 +34,7 @@
     /* video codecs */
     CODEC_ID_MPEG1VIDEO,
     CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
     CODEC_ID_MPEG2VIDEO_XVMC,
-#endif
     CODEC_ID_H261,
     CODEC_ID_H263,
     CODEC_ID_RV10,
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/vdpau.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/vdpau.h
index e25cc42d..b1c836c4 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/vdpau.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/vdpau.h
@@ -54,8 +54,12 @@
 #include "libavutil/avconfig.h"
 #include "libavutil/attributes.h"
 
-#include "avcodec.h"
-#include "version.h"
+#ifndef FF_API_CAP_VDPAU
+#define FF_API_CAP_VDPAU 1
+#endif
+#ifndef FF_API_BUFS_VDPAU
+#define FF_API_BUFS_VDPAU 1
+#endif
 
 #if FF_API_BUFS_VDPAU
 union AVVDPAUPictureInfo {
@@ -82,10 +86,6 @@ typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *,
  * during initialization or through each AVCodecContext.get_buffer()
  * function call. In any case, they must be valid prior to calling
  * decoding functions.
- *
- * The size of this structure is not a part of the public ABI and must not
- * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
- * AVVDPAUContext.
  */
 typedef struct AVVDPAUContext {
     /**
@@ -149,26 +149,6 @@ AVVDPAUContext *av_alloc_vdpaucontext(void);
 AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
 void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
 
-/**
- * Allocate an AVVDPAUContext.
- *
- * @return Newly-allocated AVVDPAUContext or NULL on failure.
- */
-AVVDPAUContext *av_vdpau_alloc_context(void);
-
-/**
- * Get a decoder profile that should be used for initializing a VDPAU decoder.
- * Should be called from the AVCodecContext.get_format() callback.
- *
- * @param avctx the codec context being used for decoding the stream
- * @param profile a pointer into which the result will be written on success.
- *                The contents of profile are undefined if this function returns
- *                an error.
- *
- * @return 0 on success (non-negative), a negative AVERROR on failure.
- */
-int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
-
 #if FF_API_CAP_VDPAU
 /** @brief The videoSurface is used for rendering. */
 #define FF_VDPAU_STATE_USED_FOR_RENDER 1
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/version.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/version.h
index 8db02700..63f6346a 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/version.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/version.h
@@ -29,7 +29,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR  43
+#define LIBAVCODEC_VERSION_MINOR  39
 #define LIBAVCODEC_VERSION_MICRO 101
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -51,9 +51,19 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_ALLOC_CONTEXT
+#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AVCODEC_OPEN
+#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
 #ifndef FF_API_OLD_DECODE_AUDIO
 #define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_OLD_TIMECODE
+#define FF_API_OLD_TIMECODE (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+
 #ifndef FF_API_OLD_ENCODE_AUDIO
 #define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
@@ -63,11 +73,8 @@
 #ifndef FF_API_CODEC_ID
 #define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_AUDIO_CONVERT
-#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
+#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_DEINTERLACE
 #define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)
@@ -93,50 +100,5 @@
 #ifndef FF_API_VOXWARE
 #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_SET_DIMENSIONS
-#define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_DEBUG_MV
-#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_AC_VLC
-#define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OLD_MSMPEG4
-#define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ASPECT_EXTENDED
-#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_THREAD_OPAQUE
-#define FF_API_THREAD_OPAQUE     (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CODEC_PKT
-#define FF_API_CODEC_PKT         (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ARCH_ALPHA
-#define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ERROR_RATE
-#define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_QSCALE_TYPE
-#define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_MB_TYPE
-#define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_MAX_BFRAMES
-#define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_FAST_MALLOC
-#define FF_API_FAST_MALLOC       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_NEG_LINESIZES
-#define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
 
 #endif /* AVCODEC_VERSION_H */
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/xvmc.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/xvmc.h
index efd69fc9..b2bf518d 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/xvmc.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavcodec/xvmc.h
@@ -29,12 +29,8 @@
 
 #include <X11/extensions/XvMC.h>
 
-#include "libavutil/attributes.h"
-#include "version.h"
 #include "avcodec.h"
 
-#if FF_API_XVMC
-
 /**
  * @defgroup lavc_codec_hwaccel_xvmc XvMC
  * @ingroup lavc_codec_hwaccel
@@ -45,7 +41,7 @@
 #define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
                                                        the number is 1337 speak for the letters IDCT MCo (motion compensation) */
 
-attribute_deprecated struct xvmc_pix_fmt {
+struct xvmc_pix_fmt {
     /** The field contains the special constant value AV_XVMC_ID.
         It is used as a test that the application correctly uses the API,
         and that there is no corruption caused by pixel routines.
@@ -169,6 +165,4 @@ attribute_deprecated struct xvmc_pix_fmt {
  * @}
  */
 
-#endif /* FF_API_XVMC */
-
 #endif /* AVCODEC_XVMC_H */
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavfilter/avfilter.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavfilter/avfilter.h
index 3518ad8b..412b1239 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavfilter/avfilter.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavfilter/avfilter.h
@@ -991,9 +991,6 @@ int avfilter_register(AVFilter *filter);
  * @return     the filter definition, if any matching one is registered.
  *             NULL if none found.
  */
-#if !FF_API_NOCONST_GET_NAME
-const
-#endif
 AVFilter *avfilter_get_by_name(const char *name);
 
 /**
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavfilter/version.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavfilter/version.h
index bbc1208e..541b8692 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavfilter/version.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavfilter/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  3
-#define LIBAVFILTER_VERSION_MINOR  91
+#define LIBAVFILTER_VERSION_MINOR  90
 #define LIBAVFILTER_VERSION_MICRO 100
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@@ -85,8 +85,5 @@
 #ifndef FF_API_DRAWTEXT_OLD_TIMELINE
 #define FF_API_DRAWTEXT_OLD_TIMELINE        (LIBAVFILTER_VERSION_MAJOR < 4)
 #endif
-#ifndef FF_API_NOCONST_GET_NAME
-#define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 4)
-#endif
 
 #endif /* AVFILTER_VERSION_H */
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavformat/avformat.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavformat/avformat.h
index 6bd54cec..4e5683c6 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavformat/avformat.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavformat/avformat.h
@@ -775,11 +775,6 @@ typedef struct AVStream {
 
     int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
 
-#if FF_API_REFERENCE_DTS
-    /* a hack to keep ABI compatibility for ffmpeg and other applications, which accesses parser even
-     * though it should not */
-    int64_t do_not_use;
-#endif
     // Timestamp generation support:
     /**
      * Timestamp corresponding to the last dts sync point.
@@ -788,6 +783,7 @@ typedef struct AVStream {
      * a DTS is received from the underlying container. Otherwise set to
      * AV_NOPTS_VALUE by default.
      */
+    int64_t reference_dts;
     int64_t first_dts;
     int64_t cur_dts;
     int64_t last_IP_pts;
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavformat/version.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavformat/version.h
index a27dce3a..0028c9b0 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavformat/version.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavformat/version.h
@@ -30,8 +30,8 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR 21
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MINOR 19
+#define LIBAVFORMAT_VERSION_MICRO 104
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \
@@ -48,9 +48,6 @@
  * dropped at a future version bump. The defines themselves are not part of
  * the public API and may change, break or disappear at any time.
  */
-#ifndef FF_API_REFERENCE_DTS
-#define FF_API_REFERENCE_DTS            (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
 
 #ifndef FF_API_ALLOC_OUTPUT_CONTEXT
 #define FF_API_ALLOC_OUTPUT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 56)
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/adler32.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/adler32.h
index 0dc69ec0..8c08d2b8 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/adler32.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/adler32.h
@@ -25,9 +25,6 @@
 #include "attributes.h"
 
 /**
- * @file
- * Public header for libavutil Adler32 hasher
- *
  * @defgroup lavu_adler32 Adler32
  * @ingroup lavu_crypto
  * @{
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/attributes.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/attributes.h
index 7d3f4a91..8c0e5b29 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/attributes.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/attributes.h
@@ -76,7 +76,7 @@
 #    define av_cold
 #endif
 
-#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
+#if AV_GCC_VERSION_AT_LEAST(4,1)
 #    define av_flatten __attribute__((flatten))
 #else
 #    define av_flatten
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/avutil.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/avutil.h
index 4e680ed0..4692c005 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/avutil.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/avutil.h
@@ -312,13 +312,6 @@ unsigned av_int_list_length_for_size(unsigned elsize,
 #define av_int_list_length(list, term) \
     av_int_list_length_for_size(sizeof(*(list)), list, term)
 
-/**
- * Open a file using a UTF-8 filename.
- * The API of this function matches POSIX fopen(), errors are returned through
- * errno.
- */
-FILE *av_fopen_utf8(const char *path, const char *mode);
-
 /**
  * @}
  * @}
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/common.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/common.h
index e487218e..b1203ad5 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/common.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/common.h
@@ -26,10 +26,6 @@
 #ifndef AVUTIL_COMMON_H
 #define AVUTIL_COMMON_H
 
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C)
-#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
-#endif
-
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/frame.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/frame.h
index a4d43032..1c785ddb 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/frame.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/frame.h
@@ -31,17 +31,15 @@
 #include "samplefmt.h"
 
 enum AVColorSpace{
-    AVCOL_SPC_RGB         =  0,
-    AVCOL_SPC_BT709       =  1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED =  2,
-    AVCOL_SPC_FCC         =  4,
-    AVCOL_SPC_BT470BG     =  5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M   =  6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M   =  7,
-    AVCOL_SPC_YCOCG       =  8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_BT2020_NCL  =  9, ///< ITU-R BT2020 non-constant luminance system
-    AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
-    AVCOL_SPC_NB              , ///< Not part of ABI
+    AVCOL_SPC_RGB         = 0,
+    AVCOL_SPC_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    AVCOL_SPC_UNSPECIFIED = 2,
+    AVCOL_SPC_FCC         = 4,
+    AVCOL_SPC_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    AVCOL_SPC_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
+    AVCOL_SPC_SMPTE240M   = 7,
+    AVCOL_SPC_YCOCG       = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+    AVCOL_SPC_NB             , ///< Not part of ABI
 };
 #define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
 
@@ -52,7 +50,6 @@ enum AVColorRange{
     AVCOL_RANGE_NB             , ///< Not part of ABI
 };
 
-
 enum AVFrameSideDataType {
     /**
      * The data is the AVPanScan struct defined in libavcodec.
@@ -389,16 +386,6 @@ typedef struct AVFrame {
     AVFrameSideData **side_data;
     int            nb_side_data;
 
-/**
- * The frame data may be corrupted, e.g. due to decoding errors.
- */
-#define AV_FRAME_FLAG_CORRUPT       (1 << 0)
-
-    /**
-     * Frame flags, a combination of AV_FRAME_FLAG_*
-     */
-    int flags;
-
     /**
      * frame timestamp estimated using various heuristics, in stream time base
      * Code outside libavcodec should access this field using:
@@ -562,7 +549,7 @@ void av_frame_free(AVFrame **frame);
  *
  * @return 0 on success, a negative AVERROR on error
  */
-int av_frame_ref(AVFrame *dst, const AVFrame *src);
+int av_frame_ref(AVFrame *dst, AVFrame *src);
 
 /**
  * Create a new frame that references the same data as src.
@@ -571,7 +558,7 @@ int av_frame_ref(AVFrame *dst, const AVFrame *src);
  *
  * @return newly created AVFrame on success, NULL on error.
  */
-AVFrame *av_frame_clone(const AVFrame *src);
+AVFrame *av_frame_clone(AVFrame *src);
 
 /**
  * Unreference all the buffers referenced by frame and reset the frame fields.
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/lzo.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/lzo.h
deleted file mode 100644
index c0340399..00000000
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/lzo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-/**
- * @defgroup lavu_lzo LZO
- * @ingroup lavu_crypto
- *
- * @{
- */
-
-#include <stdint.h>
-
-/** @name Error flags returned by av_lzo1x_decode
- * @{ */
-/// end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED  1
-/// decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL     2
-/// a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-/// a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR           8
-/** @} */
-
-#define AV_LZO_INPUT_PADDING   8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * @brief Decodes LZO 1x compressed data.
- * @param out output buffer
- * @param outlen size of output buffer, number of bytes left are returned here
- * @param in input buffer
- * @param inlen size of input buffer, number of bytes left are returned here
- * @return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LZO_H */
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/mem.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/mem.h
index 703ce819..77b7adc3 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/mem.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/mem.h
@@ -335,27 +335,6 @@ void av_max_alloc(size_t max);
  */
 void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
 
-/**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
 /**
  * @}
  */
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/old_pix_fmts.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/old_pix_fmts.h
index cd1ed7c1..3ee8aec1 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/old_pix_fmts.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/old_pix_fmts.h
@@ -44,10 +44,8 @@
     PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
     PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
     PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
     PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
     PIX_FMT_XVMC_MPEG2_IDCT,
-#endif /* FF_API_XVMC */
     PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
     PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/pixfmt.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/pixfmt.h
index 3d32d3ee..7b17a4f0 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/pixfmt.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/pixfmt.h
@@ -80,10 +80,8 @@ enum AVPixelFormat {
     AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
     AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
     AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
     AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
     AV_PIX_FMT_XVMC_MPEG2_IDCT,
-#endif /* FF_API_XVMC */
     AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
     AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/timestamp.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/timestamp.h
index f63a08c5..f010a7ee 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/timestamp.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/timestamp.h
@@ -26,6 +26,10 @@
 
 #include "common.h"
 
+#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64)
+#error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS
+#endif
+
 #define AV_TS_MAX_STRING_SIZE 32
 
 /**
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/version.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/version.h
index 3e64a20d..dd70beb9 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/version.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/version.h
@@ -75,8 +75,8 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR  53
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MINOR  48
+#define LIBAVUTIL_VERSION_MICRO 101
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \
@@ -144,12 +144,6 @@
 #ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
 #define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
-#ifndef FF_API_OLD_OPENCL
-#define FF_API_OLD_OPENCL               (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
 
 /**
  * @}
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/xtea.h b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/xtea.h
index 6f1e71e3..0899c92b 100644
--- a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/xtea.h
+++ b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/include/libavutil/xtea.h
@@ -25,8 +25,6 @@
 #include <stdint.h>
 
 /**
- * @file
- * @brief Public header for libavutil XTEA algorithm
  * @defgroup lavu_xtea XTEA
  * @ingroup lavu_crypto
  * @{
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so
old mode 100644
new mode 100755
index 9c18a72c..59c413b8
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavcodec-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavfilter-3.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavfilter-3.so
old mode 100644
new mode 100755
index 307d8342..08bad8ce
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavfilter-3.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavfilter-3.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so
old mode 100644
new mode 100755
index d6667484..ce747f60
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavformat-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so
old mode 100644
new mode 100755
index 57062a47..c92586fa
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libavutil-52.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so
old mode 100644
new mode 100755
index b410d622..edadd934
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswresample-0.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so
old mode 100644
new mode 100755
index e60e7e80..9f6259e9
Binary files a/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so and b/jni/nv_avc_dec/ffmpeg/armeabi-v7a/lib/libswscale-2.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/build_android.sh b/jni/nv_avc_dec/ffmpeg/build_android.sh
new file mode 100755
index 00000000..92c7c509
--- /dev/null
+++ b/jni/nv_avc_dec/ffmpeg/build_android.sh
@@ -0,0 +1,65 @@
+ANDROID_API_TARGET=16
+PARALLEL_JOBS=$(nproc)
+
+function build_one
+{
+PREFIX=$(pwd)/android/$CPU
+SYSROOT=$NDK/platforms/android-$ANDROID_API_TARGET/arch-$CPU
+TOOLCHAIN_PATH=$NDK/toolchains/$TOOLCHAIN_DIR/prebuilt/linux-x86_64
+./configure \
+    --prefix=$PREFIX \
+    --enable-shared \
+    --disable-static \
+    --disable-programs \
+    --disable-doc \
+    --disable-symver \
+    --disable-debug \
+    --disable-everything \
+    --disable-avdevice \
+    --enable-decoder=h264 \
+    --cross-prefix=$TOOLCHAIN_PATH/bin/$TOOLCHAIN_BIN_PREFIX- \
+    --target-os=linux \
+    --arch=$CPU \
+    --enable-cross-compile \
+    --sysroot=$SYSROOT \
+    --enable-pic \
+    --extra-cflags="-O2 -fpic $ADDI_CFLAGS" \
+    --extra-ldflags="$ADDI_LDFLAGS"
+make clean
+make -j$PARALLEL_JOBS
+make install
+}
+
+function build_mips
+{
+CPU=mips
+TOOLCHAIN_BIN_PREFIX=mipsel-linux-android
+TOOLCHAIN_DIR=mipsel-linux-android-4.8
+ADDI_CFLAGS=""
+ADDI_LDFLAGS=""
+build_one
+}
+
+function build_x86
+{
+CPU=x86
+TOOLCHAIN_BIN_PREFIX=i686-linux-android
+TOOLCHAIN_DIR=x86-4.8
+ADDI_CFLAGS=""
+ADDI_LDFLAGS=""
+build_one
+}
+
+function build_armv7
+{
+CPU=arm
+TOOLCHAIN_BIN_PREFIX=arm-linux-androideabi
+TOOLCHAIN_DIR=arm-linux-androideabi-4.8
+ADDI_CFLAGS="-marm"
+ADDI_LDFLAGS=""
+build_one
+}
+
+build_mips
+build_x86
+build_armv7
diff --git a/jni/nv_avc_dec/ffmpeg/mips/include/libavutil/lzo.h b/jni/nv_avc_dec/ffmpeg/mips/include/libavutil/lzo.h
deleted file mode 100644
index c0340399..00000000
--- a/jni/nv_avc_dec/ffmpeg/mips/include/libavutil/lzo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-/**
- * @defgroup lavu_lzo LZO
- * @ingroup lavu_crypto
- *
- * @{
- */
-
-#include <stdint.h>
-
-/** @name Error flags returned by av_lzo1x_decode
- * @{ */
-/// end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED  1
-/// decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL     2
-/// a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-/// a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR           8
-/** @} */
-
-#define AV_LZO_INPUT_PADDING   8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * @brief Decodes LZO 1x compressed data.
- * @param out output buffer
- * @param outlen size of output buffer, number of bytes left are returned here
- * @param in input buffer
- * @param inlen size of input buffer, number of bytes left are returned here
- * @return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LZO_H */
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so
index c13e9b80..5ba2de7c 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libavcodec-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libavfilter-3.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libavfilter-3.so
index 3ec79c99..d5738e08 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libavfilter-3.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libavfilter-3.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so
index d94763fe..7a0190d1 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libavformat-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so
index 4734cdde..f7df7aef 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libavutil-52.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so
index e643a2b9..d3b1bd50 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libswresample-0.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so b/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so
index 0084f70b..220338af 100755
Binary files a/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so and b/jni/nv_avc_dec/ffmpeg/mips/lib/libswscale-2.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/avcodec.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/avcodec.h
index 90abdb2e..fe64b389 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/avcodec.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/avcodec.h
@@ -37,10 +37,6 @@
 #include "libavutil/dict.h"
 #include "libavutil/frame.h"
 #include "libavutil/log.h"
-#if FF_API_FAST_MALLOC
-// to provide fast_*alloc
-#include "libavutil/mem.h"
-#endif
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
 
@@ -109,9 +105,7 @@ enum AVCodecID {
     /* video codecs */
     AV_CODEC_ID_MPEG1VIDEO,
     AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
     AV_CODEC_ID_MPEG2VIDEO_XVMC,
-#endif /* FF_API_XVMC */
     AV_CODEC_ID_H261,
     AV_CODEC_ID_H263,
     AV_CODEC_ID_RV10,
@@ -282,8 +276,6 @@ enum AVCodecID {
     AV_CODEC_ID_ESCAPE130_DEPRECATED,
     AV_CODEC_ID_G2M_DEPRECATED,
     AV_CODEC_ID_WEBP_DEPRECATED,
-    AV_CODEC_ID_HNM4_VIDEO,
-    AV_CODEC_ID_HEVC_DEPRECATED,
 
     AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
     AV_CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
@@ -634,26 +626,16 @@ enum AVColorPrimaries{
     AVCOL_PRI_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
     AVCOL_PRI_SMPTE240M   = 7, ///< functionally identical to above
     AVCOL_PRI_FILM        = 8,
-    AVCOL_PRI_BT2020      = 9, ///< ITU-R BT2020
     AVCOL_PRI_NB             , ///< Not part of ABI
 };
 
 enum AVColorTransferCharacteristic{
-    AVCOL_TRC_BT709        =  1, ///< also ITU-R BT1361
-    AVCOL_TRC_UNSPECIFIED  =  2,
-    AVCOL_TRC_GAMMA22      =  4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
-    AVCOL_TRC_GAMMA28      =  5, ///< also ITU-R BT470BG
-    AVCOL_TRC_SMPTE170M    =  6, ///< also ITU-R BT601-6 525 or 625 / ITU-R BT1358 525 or 625 / ITU-R BT1700 NTSC
-    AVCOL_TRC_SMPTE240M    =  7,
-    AVCOL_TRC_LINEAR       =  8, ///< "Linear transfer characteristics"
-    AVCOL_TRC_LOG          =  9, ///< "Logarithmic transfer characteristic (100:1 range)"
-    AVCOL_TRC_LOG_SQRT     = 10, ///< "Logarithmic transfer characteristic (100 * Sqrt( 10 ) : 1 range)"
-    AVCOL_TRC_IEC61966_2_4 = 11, ///< IEC 61966-2-4
-    AVCOL_TRC_BT1361_ECG   = 12, ///< ITU-R BT1361 Extended Colour Gamut
-    AVCOL_TRC_IEC61966_2_1 = 13, ///< IEC 61966-2-1 (sRGB or sYCC)
-    AVCOL_TRC_BT2020_10    = 14, ///< ITU-R BT2020 for 10 bit system
-    AVCOL_TRC_BT2020_12    = 15, ///< ITU-R BT2020 for 12 bit system
-    AVCOL_TRC_NB               , ///< Not part of ABI
+    AVCOL_TRC_BT709       = 1, ///< also ITU-R BT1361
+    AVCOL_TRC_UNSPECIFIED = 2,
+    AVCOL_TRC_GAMMA22     = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
+    AVCOL_TRC_GAMMA28     = 5, ///< also ITU-R BT470BG
+    AVCOL_TRC_SMPTE240M   = 7,
+    AVCOL_TRC_NB             , ///< Not part of ABI
 };
 
 /**
@@ -695,12 +677,7 @@ typedef struct RcOverride{
     float quality_factor;
 } RcOverride;
 
-#if FF_API_MAX_BFRAMES
-/**
- * @deprecated there is no libavcodec-wide limit on the number of B-frames
- */
 #define FF_MAX_B_FRAMES 16
-#endif
 
 /* encoding support
    These flags can be passed in AVCodecContext.flags before initialization.
@@ -714,7 +691,6 @@ typedef struct RcOverride{
 #define CODEC_FLAG_UNALIGNED 0x0001
 #define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
 #define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
-#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
 #define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
 #define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
 #define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
@@ -765,10 +741,8 @@ typedef struct RcOverride{
  */
 #define CODEC_CAP_DR1             0x0002
 #define CODEC_CAP_TRUNCATED       0x0008
-#if FF_API_XVMC
 /* Codec can export data for HW decoding (XvMC). */
 #define CODEC_CAP_HWACCEL         0x0010
-#endif /* FF_API_XVMC */
 /**
  * Encoder or decoder requires flushing with NULL input at the end in order to
  * give the complete and correct output.
@@ -825,12 +799,12 @@ typedef struct RcOverride{
  * Codec should fill in channel configuration and samplerate instead of container
  */
 #define CODEC_CAP_CHANNEL_CONF     0x0400
-#if FF_API_NEG_LINESIZES
+
 /**
- * @deprecated no codecs use this capability
+ * Codec is able to deal with negative linesizes
  */
 #define CODEC_CAP_NEG_LINESIZES    0x0800
-#endif
+
 /**
  * Codec supports frame-level multithreading.
  */
@@ -860,7 +834,6 @@ typedef struct RcOverride{
  */
 #define CODEC_CAP_LOSSLESS         0x80000000
 
-#if FF_API_MB_TYPE
 //The following defines may change, don't expect compatibility if you use them.
 #define MB_TYPE_INTRA4x4   0x0001
 #define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
@@ -884,7 +857,6 @@ typedef struct RcOverride{
 #define MB_TYPE_QUANT      0x00010000
 #define MB_TYPE_CBP        0x00020000
 //Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
-#endif
 
 /**
  * Pan Scan area.
@@ -915,12 +887,10 @@ typedef struct AVPanScan{
     int16_t position[3][2];
 }AVPanScan;
 
-#if FF_API_QSCALE_TYPE
 #define FF_QSCALE_TYPE_MPEG1 0
 #define FF_QSCALE_TYPE_MPEG2 1
 #define FF_QSCALE_TYPE_H264  2
 #define FF_QSCALE_TYPE_VP56  3
-#endif
 
 #if FF_API_GET_BUFFER
 #define FF_BUFFER_TYPE_INTERNAL 1
@@ -1353,9 +1323,7 @@ typedef struct AVCodecContext {
      */
     int coded_width, coded_height;
 
-#if FF_API_ASPECT_EXTENDED
 #define FF_ASPECT_EXTENDED 15
-#endif
 
     /**
      * the number of pictures in a group of pictures, or 0 for intra_only
@@ -1682,15 +1650,12 @@ typedef struct AVCodecContext {
 #define SLICE_FLAG_ALLOW_FIELD    0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
 #define SLICE_FLAG_ALLOW_PLANE    0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
 
-#if FF_API_XVMC
     /**
      * XVideo Motion Acceleration
      * - encoding: forbidden
      * - decoding: set by decoder
-     * @deprecated XvMC support is slated for removal.
      */
-    attribute_deprecated int xvmc_acceleration;
-#endif /* FF_API_XVMC */
+    int xvmc_acceleration;
 
     /**
      * macroblock decision mode
@@ -2425,16 +2390,12 @@ typedef struct AVCodecContext {
      */
     int workaround_bugs;
 #define FF_BUG_AUTODETECT       1  ///< autodetection
-#if FF_API_OLD_MSMPEG4
 #define FF_BUG_OLD_MSMPEG4      2
-#endif
 #define FF_BUG_XVID_ILACE       4
 #define FF_BUG_UMP4             8
 #define FF_BUG_NO_PADDING       16
 #define FF_BUG_AMV              32
-#if FF_API_AC_VLC
 #define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
-#endif
 #define FF_BUG_QPEL_CHROMA      64
 #define FF_BUG_STD_QPEL         128
 #define FF_BUG_QPEL_CHROMA2     256
@@ -2484,12 +2445,7 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_BITSTREAM   4
 #define FF_DEBUG_MB_TYPE     8
 #define FF_DEBUG_QP          16
-#if FF_API_DEBUG_MV
-/**
- * @deprecated this option does nothing
- */
 #define FF_DEBUG_MV          32
-#endif
 #define FF_DEBUG_DCT_COEFF   0x00000040
 #define FF_DEBUG_SKIP        0x00000080
 #define FF_DEBUG_STARTCODE   0x00000100
@@ -2497,17 +2453,13 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_ER          0x00000400
 #define FF_DEBUG_MMCO        0x00000800
 #define FF_DEBUG_BUGS        0x00001000
-#if FF_API_DEBUG_MV
-#define FF_DEBUG_VIS_QP      0x00002000 ///< only access through AVOptions from outside libavcodec
-#define FF_DEBUG_VIS_MB_TYPE 0x00004000 ///< only access through AVOptions from outside libavcodec
-#endif
+#define FF_DEBUG_VIS_QP      0x00002000
+#define FF_DEBUG_VIS_MB_TYPE 0x00004000
 #define FF_DEBUG_BUFFERS     0x00008000
 #define FF_DEBUG_THREADS     0x00010000
 
-#if FF_API_DEBUG_MV
     /**
      * debug
-     * Code outside libavcodec should access this field using AVOptions
      * - encoding: Set by user.
      * - decoding: Set by user.
      */
@@ -2515,7 +2467,6 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
 #define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
 #define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-#endif
 
     /**
      * Error recognition; may misdetect some more or less valid parts as errors.
@@ -2523,14 +2474,7 @@ typedef struct AVCodecContext {
      * - decoding: Set by user.
      */
     int err_recognition;
-
-/**
- * Verify checksums embedded in the bitstream (could be of either encoded or
- * decoded data, depending on the codec) and print an error message on mismatch.
- * If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
- * decoder returning an error.
- */
-#define AV_EF_CRCCHECK  (1<<0)
+#define AV_EF_CRCCHECK  (1<<0)          ///< verify embedded CRCs
 #define AV_EF_BITSTREAM (1<<1)          ///< detect bitstream specification deviations
 #define AV_EF_BUFFER    (1<<2)          ///< detect improper bitstream length
 #define AV_EF_EXPLODE   (1<<3)          ///< abort decoding on minor error detection
@@ -2609,9 +2553,7 @@ typedef struct AVCodecContext {
 #define FF_IDCT_SIMPLEVIS     18
 #define FF_IDCT_FAAN          20
 #define FF_IDCT_SIMPLENEON    22
-#if FF_API_ARCH_ALPHA
 #define FF_IDCT_SIMPLEALPHA   23
-#endif
 
     /**
      * bits per sample/pixel from the demuxer (needed for huffyuv).
@@ -2641,7 +2583,7 @@ typedef struct AVCodecContext {
     /**
      * the picture in the bitstream
      * - encoding: Set by libavcodec.
-     * - decoding: unused
+     * - decoding: Set by libavcodec.
      */
     AVFrame *coded_frame;
 
@@ -2713,13 +2655,13 @@ typedef struct AVCodecContext {
      */
     int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
 
-#if FF_API_THREAD_OPAQUE
     /**
-     * @deprecated this field should not be used from outside of lavc
+     * thread opaque
+     * Can be used by execute() to store some per AVCodecContext stuff.
+     * - encoding: set by execute()
+     * - decoding: set by execute()
      */
-    attribute_deprecated
     void *thread_opaque;
-#endif
 
     /**
      * noise vs. sse weight for the nsse comparsion function
@@ -2846,22 +2788,21 @@ typedef struct AVCodecContext {
     uint8_t *subtitle_header;
     int subtitle_header_size;
 
-#if FF_API_ERROR_RATE
     /**
-     * @deprecated use the 'error_rate' private AVOption of the mpegvideo
-     * encoders
+     * Simulates errors in the bitstream to test error concealment.
+     * - encoding: Set by user.
+     * - decoding: unused
      */
-    attribute_deprecated
     int error_rate;
-#endif
 
-#if FF_API_CODEC_PKT
     /**
-     * @deprecated this field is not supposed to be accessed from outside lavc
+     * Current packet as passed into the decoder, to avoid having
+     * to pass the packet into every function. Currently only valid
+     * inside lavc and get/release_buffer callbacks.
+     * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts
+     * - encoding: unused
      */
-    attribute_deprecated
     AVPacket *pkt;
-#endif
 
     /**
      * VBV delay coded in the last frame (in periods of a 27 MHz clock).
@@ -2949,19 +2890,6 @@ typedef struct AVCodecContext {
      * - encoding: set by libavcodec
      */
     int seek_preroll;
-
-#if !FF_API_DEBUG_MV
-    /**
-     * debug motion vectors
-     * Code outside libavcodec should access this field using AVOptions
-     * - encoding: Set by user.
-     * - decoding: Set by user.
-     */
-    int debug_mv;
-#define FF_DEBUG_VIS_MV_P_FOR  0x00000001 //visualize forward predicted MVs of P frames
-#define FF_DEBUG_VIS_MV_B_FOR  0x00000002 //visualize forward predicted MVs of B frames
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
-#endif
 } AVCodecContext;
 
 AVRational av_codec_get_pkt_timebase         (const AVCodecContext *avctx);
@@ -3298,6 +3226,40 @@ void avcodec_register(AVCodec *codec);
  */
 void avcodec_register_all(void);
 
+
+#if FF_API_ALLOC_CONTEXT
+/**
+ * Allocate an AVCodecContext and set its fields to default values.  The
+ * resulting struct can be deallocated by simply calling av_free().
+ *
+ * @return An AVCodecContext filled with default values or NULL on failure.
+ * @see avcodec_get_context_defaults
+ *
+ * @deprecated use avcodec_alloc_context3()
+ */
+attribute_deprecated
+AVCodecContext *avcodec_alloc_context(void);
+
+/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
+ *  we WILL change its arguments and name a few times! */
+attribute_deprecated
+AVCodecContext *avcodec_alloc_context2(enum AVMediaType);
+
+/**
+ * Set the fields of the given AVCodecContext to default values.
+ *
+ * @param s The AVCodecContext of which the fields should be set to default values.
+ * @deprecated use avcodec_get_context_defaults3
+ */
+attribute_deprecated
+void avcodec_get_context_defaults(AVCodecContext *s);
+
+/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!
+ *  we WILL change its arguments and name a few times! */
+attribute_deprecated
+void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);
+#endif
+
 /**
  * Allocate an AVCodecContext and set its fields to default values.  The
  * resulting struct can be deallocated by calling avcodec_close() on it followed
@@ -3363,13 +3325,14 @@ const AVClass *avcodec_get_subtitle_rect_class(void);
  */
 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
 
-#if FF_API_AVFRAME_LAVC
 /**
- * @deprecated use av_frame_alloc()
+ * Allocate an AVFrame and set its fields to default values.  The resulting
+ * struct must be freed using avcodec_free_frame().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ * @see avcodec_get_frame_defaults
  */
-attribute_deprecated
 AVFrame *avcodec_alloc_frame(void);
-#endif
 
 /**
  * Set the fields of the given AVFrame to default values.
@@ -3390,6 +3353,40 @@ void avcodec_get_frame_defaults(AVFrame *frame);
  */
 void avcodec_free_frame(AVFrame **frame);
 
+#if FF_API_AVCODEC_OPEN
+/**
+ * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
+ * function the context has to be allocated.
+ *
+ * The functions avcodec_find_decoder_by_name(), avcodec_find_encoder_by_name(),
+ * avcodec_find_decoder() and avcodec_find_encoder() provide an easy way for
+ * retrieving a codec.
+ *
+ * @warning This function is not thread safe!
+ *
+ * @code
+ * avcodec_register_all();
+ * codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+ * if (!codec)
+ *     exit(1);
+ *
+ * context = avcodec_alloc_context3(codec);
+ *
+ * if (avcodec_open(context, codec) < 0)
+ *     exit(1);
+ * @endcode
+ *
+ * @param avctx The context which will be set up to use the given codec.
+ * @param codec The codec to use within the context.
+ * @return zero on success, a negative value on error
+ * @see avcodec_alloc_context3, avcodec_find_decoder, avcodec_find_encoder, avcodec_close
+ *
+ * @deprecated use avcodec_open2
+ */
+attribute_deprecated
+int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
+#endif
+
 /**
  * Initialize the AVCodecContext to use the given AVCodec. Prior to using this
  * function the context has to be allocated with avcodec_alloc_context3().
@@ -4669,13 +4666,7 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en
  * @}
  */
 
-#if FF_API_SET_DIMENSIONS
-/**
- * @deprecated this function is not supposed to be used from outside of lavc
- */
-attribute_deprecated
 void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
-#endif
 
 /**
  * Put a string representing the codec tag codec_tag in buf.
@@ -4871,6 +4862,27 @@ AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
 
 /* memory */
 
+/**
+ * Reallocate the given block if it is not large enough, otherwise do nothing.
+ *
+ * @see av_realloc
+ */
+void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
+
+/**
+ * Allocate a buffer, reusing the given one if large enough.
+ *
+ * Contrary to av_fast_realloc the current buffer contents might not be
+ * preserved and on error the old buffer is freed, thus no special
+ * handling to avoid memleaks is necessary.
+ *
+ * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
+ * @param size size of the buffer *ptr points to
+ * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
+ *                 *size 0 if an error occurred.
+ */
+void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
+
 /**
  * Same behaviour av_fast_malloc but the buffer has additional
  * FF_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/old_codec_ids.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/old_codec_ids.h
index b956264f..d8a8f746 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/old_codec_ids.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/old_codec_ids.h
@@ -34,9 +34,7 @@
     /* video codecs */
     CODEC_ID_MPEG1VIDEO,
     CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
     CODEC_ID_MPEG2VIDEO_XVMC,
-#endif
     CODEC_ID_H261,
     CODEC_ID_H263,
     CODEC_ID_RV10,
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/vdpau.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/vdpau.h
index e25cc42d..b1c836c4 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/vdpau.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/vdpau.h
@@ -54,8 +54,12 @@
 #include "libavutil/avconfig.h"
 #include "libavutil/attributes.h"
 
-#include "avcodec.h"
-#include "version.h"
+#ifndef FF_API_CAP_VDPAU
+#define FF_API_CAP_VDPAU 1
+#endif
+#ifndef FF_API_BUFS_VDPAU
+#define FF_API_BUFS_VDPAU 1
+#endif
 
 #if FF_API_BUFS_VDPAU
 union AVVDPAUPictureInfo {
@@ -82,10 +86,6 @@ typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *,
  * during initialization or through each AVCodecContext.get_buffer()
  * function call. In any case, they must be valid prior to calling
  * decoding functions.
- *
- * The size of this structure is not a part of the public ABI and must not
- * be used outside of libavcodec. Use av_vdpau_alloc_context() to allocate an
- * AVVDPAUContext.
  */
 typedef struct AVVDPAUContext {
     /**
@@ -149,26 +149,6 @@ AVVDPAUContext *av_alloc_vdpaucontext(void);
 AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
 void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
 
-/**
- * Allocate an AVVDPAUContext.
- *
- * @return Newly-allocated AVVDPAUContext or NULL on failure.
- */
-AVVDPAUContext *av_vdpau_alloc_context(void);
-
-/**
- * Get a decoder profile that should be used for initializing a VDPAU decoder.
- * Should be called from the AVCodecContext.get_format() callback.
- *
- * @param avctx the codec context being used for decoding the stream
- * @param profile a pointer into which the result will be written on success.
- *                The contents of profile are undefined if this function returns
- *                an error.
- *
- * @return 0 on success (non-negative), a negative AVERROR on failure.
- */
-int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
-
 #if FF_API_CAP_VDPAU
 /** @brief The videoSurface is used for rendering. */
 #define FF_VDPAU_STATE_USED_FOR_RENDER 1
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/version.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/version.h
index 8db02700..63f6346a 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/version.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/version.h
@@ -29,7 +29,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR  43
+#define LIBAVCODEC_VERSION_MINOR  39
 #define LIBAVCODEC_VERSION_MICRO 101
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -51,9 +51,19 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_ALLOC_CONTEXT
+#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+#ifndef FF_API_AVCODEC_OPEN
+#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
 #ifndef FF_API_OLD_DECODE_AUDIO
 #define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_OLD_TIMECODE
+#define FF_API_OLD_TIMECODE (LIBAVCODEC_VERSION_MAJOR < 55)
+#endif
+
 #ifndef FF_API_OLD_ENCODE_AUDIO
 #define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
@@ -63,11 +73,8 @@
 #ifndef FF_API_CODEC_ID
 #define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_AUDIO_CONVERT
-#define FF_API_AUDIO_CONVERT     (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
 #ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  FF_API_AUDIO_CONVERT
+#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_DEINTERLACE
 #define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)
@@ -93,50 +100,5 @@
 #ifndef FF_API_VOXWARE
 #define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_SET_DIMENSIONS
-#define FF_API_SET_DIMENSIONS    (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_DEBUG_MV
-#define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_AC_VLC
-#define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OLD_MSMPEG4
-#define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ASPECT_EXTENDED
-#define FF_API_ASPECT_EXTENDED   (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_THREAD_OPAQUE
-#define FF_API_THREAD_OPAQUE     (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CODEC_PKT
-#define FF_API_CODEC_PKT         (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ARCH_ALPHA
-#define FF_API_ARCH_ALPHA        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC              (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ERROR_RATE
-#define FF_API_ERROR_RATE        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_QSCALE_TYPE
-#define FF_API_QSCALE_TYPE       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_MB_TYPE
-#define FF_API_MB_TYPE           (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_MAX_BFRAMES
-#define FF_API_MAX_BFRAMES       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_FAST_MALLOC
-#define FF_API_FAST_MALLOC       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_NEG_LINESIZES
-#define FF_API_NEG_LINESIZES     (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
 
 #endif /* AVCODEC_VERSION_H */
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/xvmc.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/xvmc.h
index efd69fc9..b2bf518d 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/xvmc.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavcodec/xvmc.h
@@ -29,12 +29,8 @@
 
 #include <X11/extensions/XvMC.h>
 
-#include "libavutil/attributes.h"
-#include "version.h"
 #include "avcodec.h"
 
-#if FF_API_XVMC
-
 /**
  * @defgroup lavc_codec_hwaccel_xvmc XvMC
  * @ingroup lavc_codec_hwaccel
@@ -45,7 +41,7 @@
 #define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
                                                        the number is 1337 speak for the letters IDCT MCo (motion compensation) */
 
-attribute_deprecated struct xvmc_pix_fmt {
+struct xvmc_pix_fmt {
     /** The field contains the special constant value AV_XVMC_ID.
         It is used as a test that the application correctly uses the API,
         and that there is no corruption caused by pixel routines.
@@ -169,6 +165,4 @@ attribute_deprecated struct xvmc_pix_fmt {
  * @}
  */
 
-#endif /* FF_API_XVMC */
-
 #endif /* AVCODEC_XVMC_H */
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavfilter/avfilter.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavfilter/avfilter.h
index 3518ad8b..412b1239 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavfilter/avfilter.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavfilter/avfilter.h
@@ -991,9 +991,6 @@ int avfilter_register(AVFilter *filter);
  * @return     the filter definition, if any matching one is registered.
  *             NULL if none found.
  */
-#if !FF_API_NOCONST_GET_NAME
-const
-#endif
 AVFilter *avfilter_get_by_name(const char *name);
 
 /**
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavfilter/version.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavfilter/version.h
index bbc1208e..541b8692 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavfilter/version.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavfilter/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  3
-#define LIBAVFILTER_VERSION_MINOR  91
+#define LIBAVFILTER_VERSION_MINOR  90
 #define LIBAVFILTER_VERSION_MICRO 100
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@@ -85,8 +85,5 @@
 #ifndef FF_API_DRAWTEXT_OLD_TIMELINE
 #define FF_API_DRAWTEXT_OLD_TIMELINE        (LIBAVFILTER_VERSION_MAJOR < 4)
 #endif
-#ifndef FF_API_NOCONST_GET_NAME
-#define FF_API_NOCONST_GET_NAME             (LIBAVFILTER_VERSION_MAJOR < 4)
-#endif
 
 #endif /* AVFILTER_VERSION_H */
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavformat/avformat.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavformat/avformat.h
index 6bd54cec..4e5683c6 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavformat/avformat.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavformat/avformat.h
@@ -775,11 +775,6 @@ typedef struct AVStream {
 
     int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */
 
-#if FF_API_REFERENCE_DTS
-    /* a hack to keep ABI compatibility for ffmpeg and other applications, which accesses parser even
-     * though it should not */
-    int64_t do_not_use;
-#endif
     // Timestamp generation support:
     /**
      * Timestamp corresponding to the last dts sync point.
@@ -788,6 +783,7 @@ typedef struct AVStream {
      * a DTS is received from the underlying container. Otherwise set to
      * AV_NOPTS_VALUE by default.
      */
+    int64_t reference_dts;
     int64_t first_dts;
     int64_t cur_dts;
     int64_t last_IP_pts;
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavformat/version.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavformat/version.h
index a27dce3a..0028c9b0 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavformat/version.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavformat/version.h
@@ -30,8 +30,8 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR 21
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MINOR 19
+#define LIBAVFORMAT_VERSION_MICRO 104
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \
@@ -48,9 +48,6 @@
  * dropped at a future version bump. The defines themselves are not part of
  * the public API and may change, break or disappear at any time.
  */
-#ifndef FF_API_REFERENCE_DTS
-#define FF_API_REFERENCE_DTS            (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
 
 #ifndef FF_API_ALLOC_OUTPUT_CONTEXT
 #define FF_API_ALLOC_OUTPUT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 56)
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/adler32.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/adler32.h
index 0dc69ec0..8c08d2b8 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/adler32.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/adler32.h
@@ -25,9 +25,6 @@
 #include "attributes.h"
 
 /**
- * @file
- * Public header for libavutil Adler32 hasher
- *
  * @defgroup lavu_adler32 Adler32
  * @ingroup lavu_crypto
  * @{
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/attributes.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/attributes.h
index 7d3f4a91..8c0e5b29 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/attributes.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/attributes.h
@@ -76,7 +76,7 @@
 #    define av_cold
 #endif
 
-#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
+#if AV_GCC_VERSION_AT_LEAST(4,1)
 #    define av_flatten __attribute__((flatten))
 #else
 #    define av_flatten
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/avconfig.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/avconfig.h
index bac323a5..f6685b72 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/avconfig.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/avconfig.h
@@ -2,7 +2,7 @@
 #ifndef AVUTIL_AVCONFIG_H
 #define AVUTIL_AVCONFIG_H
 #define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 0
+#define AV_HAVE_FAST_UNALIGNED 1
 #define AV_HAVE_INCOMPATIBLE_LIBAV_ABI 0
 #define AV_HAVE_INCOMPATIBLE_FORK_ABI 0
 #endif /* AVUTIL_AVCONFIG_H */
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/avutil.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/avutil.h
index 4e680ed0..4692c005 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/avutil.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/avutil.h
@@ -312,13 +312,6 @@ unsigned av_int_list_length_for_size(unsigned elsize,
 #define av_int_list_length(list, term) \
     av_int_list_length_for_size(sizeof(*(list)), list, term)
 
-/**
- * Open a file using a UTF-8 filename.
- * The API of this function matches POSIX fopen(), errors are returned through
- * errno.
- */
-FILE *av_fopen_utf8(const char *path, const char *mode);
-
 /**
  * @}
  * @}
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/common.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/common.h
index e487218e..b1203ad5 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/common.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/common.h
@@ -26,10 +26,6 @@
 #ifndef AVUTIL_COMMON_H
 #define AVUTIL_COMMON_H
 
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C)
-#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
-#endif
-
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/frame.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/frame.h
index a4d43032..1c785ddb 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/frame.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/frame.h
@@ -31,17 +31,15 @@
 #include "samplefmt.h"
 
 enum AVColorSpace{
-    AVCOL_SPC_RGB         =  0,
-    AVCOL_SPC_BT709       =  1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED =  2,
-    AVCOL_SPC_FCC         =  4,
-    AVCOL_SPC_BT470BG     =  5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M   =  6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M   =  7,
-    AVCOL_SPC_YCOCG       =  8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_BT2020_NCL  =  9, ///< ITU-R BT2020 non-constant luminance system
-    AVCOL_SPC_BT2020_CL   = 10, ///< ITU-R BT2020 constant luminance system
-    AVCOL_SPC_NB              , ///< Not part of ABI
+    AVCOL_SPC_RGB         = 0,
+    AVCOL_SPC_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
+    AVCOL_SPC_UNSPECIFIED = 2,
+    AVCOL_SPC_FCC         = 4,
+    AVCOL_SPC_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
+    AVCOL_SPC_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
+    AVCOL_SPC_SMPTE240M   = 7,
+    AVCOL_SPC_YCOCG       = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
+    AVCOL_SPC_NB             , ///< Not part of ABI
 };
 #define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
 
@@ -52,7 +50,6 @@ enum AVColorRange{
     AVCOL_RANGE_NB             , ///< Not part of ABI
 };
 
-
 enum AVFrameSideDataType {
     /**
      * The data is the AVPanScan struct defined in libavcodec.
@@ -389,16 +386,6 @@ typedef struct AVFrame {
     AVFrameSideData **side_data;
     int            nb_side_data;
 
-/**
- * The frame data may be corrupted, e.g. due to decoding errors.
- */
-#define AV_FRAME_FLAG_CORRUPT       (1 << 0)
-
-    /**
-     * Frame flags, a combination of AV_FRAME_FLAG_*
-     */
-    int flags;
-
     /**
      * frame timestamp estimated using various heuristics, in stream time base
      * Code outside libavcodec should access this field using:
@@ -562,7 +549,7 @@ void av_frame_free(AVFrame **frame);
  *
  * @return 0 on success, a negative AVERROR on error
  */
-int av_frame_ref(AVFrame *dst, const AVFrame *src);
+int av_frame_ref(AVFrame *dst, AVFrame *src);
 
 /**
  * Create a new frame that references the same data as src.
@@ -571,7 +558,7 @@ int av_frame_ref(AVFrame *dst, const AVFrame *src);
  *
  * @return newly created AVFrame on success, NULL on error.
  */
-AVFrame *av_frame_clone(const AVFrame *src);
+AVFrame *av_frame_clone(AVFrame *src);
 
 /**
  * Unreference all the buffers referenced by frame and reset the frame fields.
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/lzo.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/lzo.h
deleted file mode 100644
index c0340399..00000000
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/lzo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * LZO 1x decompression
- * copyright (c) 2006 Reimar Doeffinger
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg 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.
- *
- * FFmpeg 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_LZO_H
-#define AVUTIL_LZO_H
-
-/**
- * @defgroup lavu_lzo LZO
- * @ingroup lavu_crypto
- *
- * @{
- */
-
-#include <stdint.h>
-
-/** @name Error flags returned by av_lzo1x_decode
- * @{ */
-/// end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED  1
-/// decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL     2
-/// a reference to previously decoded data was wrong
-#define AV_LZO_INVALID_BACKPTR 4
-/// a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR           8
-/** @} */
-
-#define AV_LZO_INPUT_PADDING   8
-#define AV_LZO_OUTPUT_PADDING 12
-
-/**
- * @brief Decodes LZO 1x compressed data.
- * @param out output buffer
- * @param outlen size of output buffer, number of bytes left are returned here
- * @param in input buffer
- * @param inlen size of input buffer, number of bytes left are returned here
- * @return 0 on success, otherwise a combination of the error flags above
- *
- * Make sure all buffers are appropriately padded, in must provide
- * AV_LZO_INPUT_PADDING, out must provide AV_LZO_OUTPUT_PADDING additional bytes.
- */
-int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_LZO_H */
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/mem.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/mem.h
index 703ce819..77b7adc3 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/mem.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/mem.h
@@ -335,27 +335,6 @@ void av_max_alloc(size_t max);
  */
 void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
 
-/**
- * Reallocate the given block if it is not large enough, otherwise do nothing.
- *
- * @see av_realloc
- */
-void *av_fast_realloc(void *ptr, unsigned int *size, size_t min_size);
-
-/**
- * Allocate a buffer, reusing the given one if large enough.
- *
- * Contrary to av_fast_realloc the current buffer contents might not be
- * preserved and on error the old buffer is freed, thus no special
- * handling to avoid memleaks is necessary.
- *
- * @param ptr pointer to pointer to already allocated buffer, overwritten with pointer to new buffer
- * @param size size of the buffer *ptr points to
- * @param min_size minimum size of *ptr buffer after returning, *ptr will be NULL and
- *                 *size 0 if an error occurred.
- */
-void av_fast_malloc(void *ptr, unsigned int *size, size_t min_size);
-
 /**
  * @}
  */
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/old_pix_fmts.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/old_pix_fmts.h
index cd1ed7c1..3ee8aec1 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/old_pix_fmts.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/old_pix_fmts.h
@@ -44,10 +44,8 @@
     PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
     PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
     PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
     PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
     PIX_FMT_XVMC_MPEG2_IDCT,
-#endif /* FF_API_XVMC */
     PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
     PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/pixfmt.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/pixfmt.h
index 3d32d3ee..7b17a4f0 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/pixfmt.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/pixfmt.h
@@ -80,10 +80,8 @@ enum AVPixelFormat {
     AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
     AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
     AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-#if FF_API_XVMC
     AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
     AV_PIX_FMT_XVMC_MPEG2_IDCT,
-#endif /* FF_API_XVMC */
     AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
     AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/timestamp.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/timestamp.h
index f63a08c5..f010a7ee 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/timestamp.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/timestamp.h
@@ -26,6 +26,10 @@
 
 #include "common.h"
 
+#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64)
+#error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS
+#endif
+
 #define AV_TS_MAX_STRING_SIZE 32
 
 /**
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/version.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/version.h
index 3e64a20d..dd70beb9 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/version.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/version.h
@@ -75,8 +75,8 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR  53
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MINOR  48
+#define LIBAVUTIL_VERSION_MICRO 101
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \
@@ -144,12 +144,6 @@
 #ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
 #define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
-#ifndef FF_API_OLD_OPENCL
-#define FF_API_OLD_OPENCL               (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_XVMC
-#define FF_API_XVMC                     (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
 
 /**
  * @}
diff --git a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/xtea.h b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/xtea.h
index 6f1e71e3..0899c92b 100644
--- a/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/xtea.h
+++ b/jni/nv_avc_dec/ffmpeg/x86/include/libavutil/xtea.h
@@ -25,8 +25,6 @@
 #include <stdint.h>
 
 /**
- * @file
- * @brief Public header for libavutil XTEA algorithm
  * @defgroup lavu_xtea XTEA
  * @ingroup lavu_crypto
  * @{
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so
old mode 100644
new mode 100755
index 3afadd8e..f9d47074
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libavcodec-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libavfilter-3.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libavfilter-3.so
old mode 100644
new mode 100755
index cf86a483..a431e948
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libavfilter-3.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libavfilter-3.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so
old mode 100644
new mode 100755
index 7ccad390..577c54c2
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libavformat-55.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so
old mode 100644
new mode 100755
index 3fc052f7..6a33bb48
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libavutil-52.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so
old mode 100644
new mode 100755
index 23c6a399..ce64b3cc
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libswresample-0.so differ
diff --git a/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so b/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so
old mode 100644
new mode 100755
index 5307a3c5..f37f8b97
Binary files a/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so and b/jni/nv_avc_dec/ffmpeg/x86/lib/libswscale-2.so differ
diff --git a/libs/armeabi-v7a/libavcodec-55.so b/libs/armeabi-v7a/libavcodec-55.so
index 9c18a72c..59c413b8 100755
Binary files a/libs/armeabi-v7a/libavcodec-55.so and b/libs/armeabi-v7a/libavcodec-55.so differ
diff --git a/libs/armeabi-v7a/libavfilter-3.so b/libs/armeabi-v7a/libavfilter-3.so
index 307d8342..08bad8ce 100755
Binary files a/libs/armeabi-v7a/libavfilter-3.so and b/libs/armeabi-v7a/libavfilter-3.so differ
diff --git a/libs/armeabi-v7a/libavformat-55.so b/libs/armeabi-v7a/libavformat-55.so
index d6667484..ce747f60 100755
Binary files a/libs/armeabi-v7a/libavformat-55.so and b/libs/armeabi-v7a/libavformat-55.so differ
diff --git a/libs/armeabi-v7a/libavutil-52.so b/libs/armeabi-v7a/libavutil-52.so
index 57062a47..c92586fa 100755
Binary files a/libs/armeabi-v7a/libavutil-52.so and b/libs/armeabi-v7a/libavutil-52.so differ
diff --git a/libs/armeabi-v7a/libswresample-0.so b/libs/armeabi-v7a/libswresample-0.so
index b410d622..edadd934 100755
Binary files a/libs/armeabi-v7a/libswresample-0.so and b/libs/armeabi-v7a/libswresample-0.so differ
diff --git a/libs/armeabi-v7a/libswscale-2.so b/libs/armeabi-v7a/libswscale-2.so
index e60e7e80..9f6259e9 100755
Binary files a/libs/armeabi-v7a/libswscale-2.so and b/libs/armeabi-v7a/libswscale-2.so differ
diff --git a/libs/mips/libavcodec-55.so b/libs/mips/libavcodec-55.so
index c13e9b80..5ba2de7c 100755
Binary files a/libs/mips/libavcodec-55.so and b/libs/mips/libavcodec-55.so differ
diff --git a/libs/mips/libavfilter-3.so b/libs/mips/libavfilter-3.so
index 3ec79c99..d5738e08 100755
Binary files a/libs/mips/libavfilter-3.so and b/libs/mips/libavfilter-3.so differ
diff --git a/libs/mips/libavformat-55.so b/libs/mips/libavformat-55.so
index d94763fe..7a0190d1 100755
Binary files a/libs/mips/libavformat-55.so and b/libs/mips/libavformat-55.so differ
diff --git a/libs/mips/libavutil-52.so b/libs/mips/libavutil-52.so
index 4734cdde..f7df7aef 100755
Binary files a/libs/mips/libavutil-52.so and b/libs/mips/libavutil-52.so differ
diff --git a/libs/mips/libswresample-0.so b/libs/mips/libswresample-0.so
index e643a2b9..d3b1bd50 100755
Binary files a/libs/mips/libswresample-0.so and b/libs/mips/libswresample-0.so differ
diff --git a/libs/mips/libswscale-2.so b/libs/mips/libswscale-2.so
index 0084f70b..220338af 100755
Binary files a/libs/mips/libswscale-2.so and b/libs/mips/libswscale-2.so differ
diff --git a/libs/x86/libavcodec-55.so b/libs/x86/libavcodec-55.so
index 3afadd8e..f9d47074 100755
Binary files a/libs/x86/libavcodec-55.so and b/libs/x86/libavcodec-55.so differ
diff --git a/libs/x86/libavfilter-3.so b/libs/x86/libavfilter-3.so
index cf86a483..a431e948 100755
Binary files a/libs/x86/libavfilter-3.so and b/libs/x86/libavfilter-3.so differ
diff --git a/libs/x86/libavformat-55.so b/libs/x86/libavformat-55.so
index 7ccad390..577c54c2 100755
Binary files a/libs/x86/libavformat-55.so and b/libs/x86/libavformat-55.so differ
diff --git a/libs/x86/libavutil-52.so b/libs/x86/libavutil-52.so
index 3fc052f7..6a33bb48 100755
Binary files a/libs/x86/libavutil-52.so and b/libs/x86/libavutil-52.so differ
diff --git a/libs/x86/libnv_avc_dec.so b/libs/x86/libnv_avc_dec.so
index af38168e..55429b9d 100755
Binary files a/libs/x86/libnv_avc_dec.so and b/libs/x86/libnv_avc_dec.so differ
diff --git a/libs/x86/libswresample-0.so b/libs/x86/libswresample-0.so
index 23c6a399..ce64b3cc 100755
Binary files a/libs/x86/libswresample-0.so and b/libs/x86/libswresample-0.so differ
diff --git a/libs/x86/libswscale-2.so b/libs/x86/libswscale-2.so
index 5307a3c5..f37f8b97 100755
Binary files a/libs/x86/libswscale-2.so and b/libs/x86/libswscale-2.so differ