@@ -18,6 +18,8 @@ PROGS_G     = $(PROGS-yes:%=%_g$(EXESUF))

 OBJS        = $(PROGS-yes:%=%.o) cmdutils.o

 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64

 HOSTPROGS  := $(TESTTOOLS:%=tests/%)

+TOOLS       = qt-faststart trasher

+TOOLS-$(CONFIG_ZLIB) += cws2fws

 BASENAMES   = ffmpeg ffplay ffprobe ffserver

 ALLPROGS    = $(BASENAMES:%=%$(EXESUF))

@@ -51,6 +53,11 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)

 	$(CP) $< $@

 	$(STRIP) $@

+$(TOOLS): %$(EXESUF): %.o

+	$(LD) $(LDFLAGS) -o $@ $< $(ELIBS)

+

+tools/cws2fws$(EXESUF): ELIBS = -lz

+

 config.h: .config

 .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))

 	@-tput bold 2>/dev/null

@@ -59,7 +66,7 @@ config.h: .config

 SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \

                ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \

-               HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS

+               HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS

 define RESET

 $(1) :=

@@ -81,18 +88,6 @@ ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)

 %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)

 	$(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)

-TOOLS     = cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher

-TOOLOBJS := $(TOOLS:%=tools/%.o)

-TOOLS    := $(TOOLS:%=tools/%$(EXESUF))

-

-alltools: $(TOOLS)

-

-tools/%$(EXESUF): tools/%.o

-	$(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)

-

-$(TOOLOBJS): %.o: %.c | tools

-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $<

-

 OBJDIRS += tools

 -include $(wildcard tools/*.d)

@@ -63,7 +63,7 @@ void init_opts(void)

 {

     int i;

     for (i = 0; i < AVMEDIA_TYPE_NB; i++)

-        avcodec_opts[i] = avcodec_alloc_context2(i);

+        avcodec_opts[i] = avcodec_alloc_context3(NULL);

     avformat_opts = avformat_alloc_context();

 #if CONFIG_SWSCALE

     sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC, NULL, NULL, NULL);

@@ -77,6 +77,9 @@ TESTOBJS  := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)

 TESTPROGS := $(TESTPROGS:%=$(SUBDIR)%-test$(EXESUF))

 HOSTOBJS  := $(HOSTPROGS:%=$(SUBDIR)%.o)

 HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF))

+TOOLS     += $(TOOLS-yes)

+TOOLOBJS  := $(TOOLS:%=tools/%.o)

+TOOLS     := $(TOOLS:%=tools/%$(EXESUF))

 DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))

@@ -85,15 +88,18 @@ SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)

 SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)

 checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))

+alltools: $(TOOLS)

+

 $(HOSTOBJS): %.o: %.c

 	$(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<

 $(HOSTPROGS): %$(HOSTEXESUF): %.o

 	$(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)

-$(OBJS):     | $(dir $(OBJS))

-$(HOSTOBJS): | $(dir $(HOSTOBJS))

-$(TESTOBJS): | $(dir $(TESTOBJS))

+$(OBJS):     | $(sort $(dir $(OBJS)))

+$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))

+$(TESTOBJS): | $(sort $(dir $(TESTOBJS)))

+$(TOOLOBJS): | tools

 OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS))

@@ -2137,7 +2137,7 @@ if test "$cpu" = host; then

         gcc|llvm_gcc)

             check_native(){

                 $cc $1=native -v -c -o $TMPO $TMPC >$TMPE 2>&1 || return

-                sed -n "/$1=/{

+                sed -n "/cc1.*$1=/{

                             s/.*$1=\\([^ ]*\\).*/\\1/

                             p

                             q

@@ -56,7 +56,7 @@ static void audio_encode_example(const char *filename)

         exit(1);

     }

-    c= avcodec_alloc_context();

+    c = avcodec_alloc_context3(codec);

     /* put sample parameters */

     c->bit_rate = 64000;

@@ -127,7 +127,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)

         exit(1);

     }

-    c= avcodec_alloc_context();

+    c = avcodec_alloc_context3(codec);

     /* open it */

     if (avcodec_open(c, codec) < 0) {

@@ -208,7 +208,7 @@ static void video_encode_example(const char *filename)

         exit(1);

     }

-    c= avcodec_alloc_context();

+    c = avcodec_alloc_context3(codec);

     picture= avcodec_alloc_frame();

     /* put sample parameters */

@@ -335,7 +335,7 @@ static void video_decode_example(const char *outfilename, const char *filename)

         exit(1);

     }

-    c= avcodec_alloc_context();

+    c = avcodec_alloc_context3(codec);

     picture= avcodec_alloc_frame();

     if(codec->capabilities&CODEC_CAP_TRUNCATED)

@@ -294,7 +294,7 @@ static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)

         if (!(codec = avcodec_find_decoder(stream->codec->codec_id))) {

             fprintf(stderr, "Unsupported codec with id %d for input stream %d\n",

                     stream->codec->codec_id, stream->index);

-        } else if (avcodec_open(stream->codec, codec) < 0) {

+        } else if (avcodec_open2(stream->codec, codec, NULL) < 0) {

             fprintf(stderr, "Error while opening codec for input stream %d\n",

                     stream->index);

         }

@@ -2117,7 +2117,7 @@ static void open_parser(AVFormatContext *s, int i)

         codec = avcodec_find_decoder(st->codec->codec_id);

         if (codec && (codec->capabilities & CODEC_CAP_PARSE_ONLY)) {

             st->codec->parse_only = 1;

-            if (avcodec_open(st->codec, codec) < 0)

+            if (avcodec_open2(st->codec, codec, NULL) < 0)

                 st->codec->parse_only = 0;

         }

     }

@@ -3468,7 +3468,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop

     if (!fst)

         return NULL;

     if (copy) {

-        fst->codec= avcodec_alloc_context();

+        fst->codec = avcodec_alloc_context3(NULL);

         memcpy(fst->codec, codec, sizeof(AVCodecContext));

         if (codec->extradata_size) {

             fst->codec->extradata = av_malloc(codec->extradata_size);

@@ -3885,7 +3885,7 @@ static void add_codec(FFStream *stream, AVCodecContext *av)

     st = av_mallocz(sizeof(AVStream));

     if (!st)

         return;

-    st->codec = avcodec_alloc_context();

+    st->codec = avcodec_alloc_context3(NULL);

     stream->streams[stream->nb_streams++] = st;

     memcpy(st->codec, av, sizeof(AVCodecContext));

 }

@@ -30,6 +30,7 @@

 #include <string.h>

 #include "libavutil/crc.h"

+#include "libavutil/opt.h"

 #include "internal.h"

 #include "aac_ac3_parser.h"

 #include "ac3_parser.h"

@@ -1438,6 +1439,20 @@ static av_cold int ac3_decode_end(AVCodecContext *avctx)

     return 0;

 }

+#define OFFSET(x) offsetof(AC3DecodeContext, x)

+#define PAR (AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM)

+static const AVOption options[] = {

+    { "drc_scale", "percentage of dynamic range compression to apply", OFFSET(drc_scale), FF_OPT_TYPE_FLOAT, {1.0}, 0.0, 1.0, PAR },

+    { NULL},

+};

+

+static const AVClass ac3_decoder_class = {

+    .class_name = "(E-)AC3 decoder",

+    .item_name  = av_default_item_name,

+    .option     = options,

+    .version    = LIBAVUTIL_VERSION_INT,

+};

+

 AVCodec ff_ac3_decoder = {

     .name = "ac3",

     .type = AVMEDIA_TYPE_AUDIO,

@@ -1450,6 +1465,7 @@ AVCodec ff_ac3_decoder = {

     .sample_fmts = (const enum AVSampleFormat[]) {

         AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE

     },

+    .priv_class = &ac3_decoder_class,

 };

 #if CONFIG_EAC3_DECODER

@@ -1465,5 +1481,6 @@ AVCodec ff_eac3_decoder = {

     .sample_fmts = (const enum AVSampleFormat[]) {

         AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE

     },

+    .priv_class = &ac3_decoder_class,

 };

 #endif

@@ -66,6 +66,7 @@

 #define AC3_FRAME_BUFFER_SIZE 32768

 typedef struct {

+    AVClass        *class;                  ///< class for AVOptions

     AVCodecContext *avctx;                  ///< parent context

     GetBitContext gbc;                      ///< bitstream reader

@@ -143,6 +144,7 @@ typedef struct {

 ///@name Dynamic range

     float dynamic_range[2];                 ///< dynamic range

+    float drc_scale;                        ///< percentage of dynamic range compression to be applied

 ///@}

 ///@name Bandwidth

@@ -349,9 +349,7 @@ function ff_fft_permute_neon, export=1

         pop             {r4,pc}

 endfunc

-        .section .rodata

-        .align 4

-fft_tab_neon:

+const   fft_tab_neon

         .word fft4_neon

         .word fft8_neon

         .word fft16_neon

@@ -367,8 +365,12 @@ fft_tab_neon:

         .word fft16384_neon

         .word fft32768_neon

         .word fft65536_neon

-ELF     .size fft_tab_neon, . - fft_tab_neon

+endconst

-        .align 4

-pmmp:   .float  +1.0, -1.0, -1.0, +1.0

-mppm:   .float  -M_SQRT1_2, M_SQRT1_2, M_SQRT1_2, -M_SQRT1_2

+const   pmmp, align=4

+        .float          +1.0, -1.0, -1.0, +1.0

+endconst

+

+const   mppm, align=4

+        .float          -M_SQRT1_2, M_SQRT1_2, M_SQRT1_2, -M_SQRT1_2

+endconst

@@ -383,8 +383,8 @@ function ff_h264_idct8_add4_neon, export=1

         pop             {r4-r8,pc}

 endfunc

-        .section .rodata

-scan8:  .byte           4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8

+const   scan8

+        .byte           4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8

         .byte           6+ 1*8, 7+ 1*8, 6+ 2*8, 7+ 2*8

         .byte           4+ 3*8, 5+ 3*8, 4+ 4*8, 5+ 4*8

         .byte           6+ 3*8, 7+ 3*8, 6+ 4*8, 7+ 4*8

@@ -396,3 +396,4 @@ scan8:  .byte           4+ 1*8, 5+ 1*8, 4+ 2*8, 5+ 2*8

         .byte           6+11*8, 7+11*8, 6+12*8, 7+12*8

         .byte           4+13*8, 5+13*8, 4+14*8, 5+14*8

         .byte           6+13*8, 7+13*8, 6+14*8, 7+14*8

+endconst

@@ -166,12 +166,9 @@ function ff_pred16x16_plane_neon, export=1

         bx              lr

 endfunc

-        .section        .rodata

-        .align          4

-p16weight:

+const   p16weight, align=4

         .short          1,2,3,4,5,6,7,8

-

-        .text

+endconst

 function ff_pred8x8_hor_neon, export=1

         sub             r2,  r0,  #1

@@ -243,10 +243,9 @@ function idct_col4_st8_neon

         bx              lr

 endfunc

-        .section .rodata

-        .align 4

-idct_coeff_neon:

+const   idct_coeff_neon, align=4

         .short W1, W2, W3, W4, W5, W6, W7, W4c

+endconst

         .macro idct_start data

         push            {r4-r7, lr}

@@ -20,11 +20,9 @@

 #include "asm.S"

-.section .rodata

-.align 4

-

-vp3_idct_constants:

+const   vp3_idct_constants, align=4

 .short 64277, 60547, 54491, 46341, 36410, 25080, 12785

+endconst

 #define xC1S7 d0[0]

 #define xC2S6 d0[1]

@@ -34,8 +32,6 @@ vp3_idct_constants:

 #define xC6S2 d1[1]

 #define xC7S1 d1[2]

-.text

-

 .macro vp3_loop_filter

     vsubl.u8        q3,  d18, d17

     vsubl.u8        q2,  d16, d19

@@ -240,9 +240,9 @@ A       orrcs           r8,  r8,  r10, lsl r6

         b               5b

 endfunc

-        .section        .rodata

-zigzag_scan:

+const zigzag_scan

         .byte            0,  2,  8, 16

         .byte           10,  4,  6, 12

         .byte           18, 24, 26, 20

         .byte           14, 22, 28, 30

+endconst

@@ -30,6 +30,7 @@

 #include "libavutil/samplefmt.h"

 #include "libavutil/avutil.h"

 #include "libavutil/cpu.h"

+#include "libavutil/dict.h"

 #include "libavutil/log.h"

 #include "libavutil/pixfmt.h"

 #include "libavutil/rational.h"

@@ -2590,13 +2591,16 @@ typedef struct AVCodecContext {

     int request_channels;

 #endif

+#if FF_API_DRC_SCALE

     /**

      * Percentage of dynamic range compression to be applied by the decoder.

      * The default value is 1.0, corresponding to full compression.

      * - encoding: unused

      * - decoding: Set by user.

+     * @deprecated use AC3 decoder private option instead.

      */

-    float drc_scale;

+    attribute_deprecated float drc_scale;

+#endif

     /**

      * opaque 64bit number (generally a PTS) that will be reordered and

@@ -2916,6 +2920,8 @@ typedef struct AVProfile {

     const char *name; ///< short name for the profile

 } AVProfile;

+typedef struct AVCodecDefault AVCodecDefault;

+

 /**

  * AVCodec.

  */

@@ -2978,6 +2984,11 @@ typedef struct AVCodec {

      */

     int (*update_thread_context)(AVCodecContext *dst, const AVCodecContext *src);

     /** @} */

+

+    /**

+     * Private codec-specific defaults.

+     */

+    const AVCodecDefault *defaults;

 } AVCodec;

 /**

@@ -3593,21 +3604,38 @@ void avcodec_get_context_defaults2(AVCodecContext *s, enum AVMediaType);

  *  we WILL change its arguments and name a few times! */

 int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec);

+#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);

+#endif

-/** THIS FUNCTION IS NOT YET PART OF THE PUBLIC API!

- *  we WILL change its arguments and name a few times! */

+/**

+ * Allocate an AVCodecContext and set its fields to default values.  The

+ * resulting struct can be deallocated by simply calling av_free().

+ *

+ * @param codec if non-NULL, allocate private data and initialize defaults

+ *              for the given codec. It is illegal to then call avcodec_open()

+ *              with a different codec.

+ *

+ * @return An AVCodecContext filled with default values or NULL on failure.

+ * @see avcodec_get_context_defaults

+ *

+ * @deprecated use avcodec_alloc_context3()

+ */

 AVCodecContext *avcodec_alloc_context3(AVCodec *codec);

 /**

@@ -3617,7 +3645,7 @@ AVCodecContext *avcodec_alloc_context3(AVCodec *codec);

  * can use this AVCodecContext to decode/encode video/audio data.

  *

  * @param dest target codec context, should be initialized with

- *             avcodec_alloc_context(), but otherwise uninitialized

+ *             avcodec_alloc_context3(), but otherwise uninitialized

  * @param src source codec context

  * @return AVERROR() on error (e.g. memory allocation error), 0 on success

  */

@@ -3687,6 +3715,7 @@ int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, v

 int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);

 //FIXME func typedef

+#if FF_API_AVCODEC_OPEN

 /**

  * Initialize the AVCodecContext to use the given AVCodec. Prior to using this

  * function the context has to be allocated.

@@ -3703,7 +3732,7 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2,

  * if (!codec)

  *     exit(1);

  *

- * context = avcodec_alloc_context();

+ * context = avcodec_alloc_context3(codec);

  *

  * if (avcodec_open(context, codec) < 0)

  *     exit(1);

@@ -3712,9 +3741,46 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2,

  * @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_context, avcodec_find_decoder, avcodec_find_encoder, avcodec_close

+ * @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_context().

+ *

+ * 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();

+ * av_dict_set(&opts, "b", "2.5M", 0);

+ * codec = avcodec_find_decoder(CODEC_ID_H264);

+ * if (!codec)

+ *     exit(1);

+ *

+ * context = avcodec_alloc_context();

+ *

+ * if (avcodec_open(context, codec, opts) < 0)

+ *     exit(1);

+ * @endcode

+ *

+ * @param avctx The context to initialize.

+ * @param options A dictionary filled with AVCodecContext and codec-private options.

+ *                On return this object will be filled with options that were not found.

+ *

+ * @return zero on success, a negative value on error

+ * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),

+ *      av_dict_set(), av_opt_find().

+ */

+int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options);

 /**

  * Decode the audio frame of size avpkt->size from avpkt->data into samples.

@@ -43,15 +43,6 @@

 #   undef PIXEL_SPLAT_X4

 #else

 #   define AVCODEC_H264_HIGH_DEPTH_H

-#   define CLIP_PIXEL(depth)\

-    static inline uint16_t av_clip_pixel_ ## depth (int p)\

-    {\

-        const int pixel_max = (1 << depth)-1;\

-        return (p & ~pixel_max) ? (-p)>>31 & pixel_max : p;\

-    }

-

-CLIP_PIXEL( 9)

-CLIP_PIXEL(10)

 #endif

 #if BIT_DEPTH > 8

@@ -70,6 +61,9 @@ CLIP_PIXEL(10)

 #   define AV_WN4P  AV_WN64

 #   define AV_WN4PA AV_WN64A

 #   define PIXEL_SPLAT_X4(x) ((x)*0x0001000100010001ULL)

+

+#   define av_clip_pixel(a) av_clip_uintp2(a, BIT_DEPTH)

+#   define CLIP(a)          av_clip_uintp2(a, BIT_DEPTH)

 #else

 #   define pixel  uint8_t

 #   define pixel2 uint16_t

@@ -86,21 +80,12 @@ CLIP_PIXEL(10)

 #   define AV_WN4P  AV_WN32

 #   define AV_WN4PA AV_WN32A

 #   define PIXEL_SPLAT_X4(x) ((x)*0x01010101U)

-#endif

-#if BIT_DEPTH == 8

 #   define av_clip_pixel(a) av_clip_uint8(a)

 #   define CLIP(a) cm[a]

-#   define FUNC(a)  a ## _8

-#   define FUNCC(a) a ## _8_c

-#elif BIT_DEPTH == 9

-#   define av_clip_pixel(a) av_clip_pixel_9(a)

-#   define CLIP(a)          av_clip_pixel_9(a)

-#   define FUNC(a)  a ## _9

-#   define FUNCC(a) a ## _9_c

-#elif BIT_DEPTH == 10

-#   define av_clip_pixel(a) av_clip_pixel_10(a)

-#   define CLIP(a)          av_clip_pixel_10(a)

-#   define FUNC(a)  a ## _10

-#   define FUNCC(a) a ## _10_c

 #endif

+

+#define FUNC3(a, b, c)  a ## _ ## b ## c

+#define FUNC2(a, b, c)  FUNC3(a, b, c)

+#define FUNC(a)  FUNC2(a, BIT_DEPTH,)

+#define FUNCC(a) FUNC2(a, BIT_DEPTH, _c)

@@ -211,8 +211,6 @@ EMULATED_EDGE(8)

 EMULATED_EDGE(9)

 EMULATED_EDGE(10)

-#define ff_emulated_edge_mc ff_emulated_edge_mc_8

-

 void ff_add_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize);

 void ff_put_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize);

 void ff_put_signed_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize);

@@ -27,6 +27,11 @@

 #include <stdint.h>

 #include "avcodec.h"

+struct AVCodecDefault {

+    const uint8_t *key;

+    const uint8_t *value;

+};

+

 /**

  * Determine whether pix_fmt is a hardware accelerated format.

  */

@@ -144,7 +144,7 @@ int main(int argc, char **argv)

     printf("ffmpeg motion test\n");

-    ctx = avcodec_alloc_context();

+    ctx = avcodec_alloc_context3(NULL);

     ctx->dsp_mask = AV_CPU_FLAG_FORCE;

     dsputil_init(&cctx, ctx);

     for (c = 0; c < flags_size; c++) {

@@ -944,7 +944,7 @@ static int skip_check(MpegEncContext *s, Picture *p, Picture *ref){

 static int estimate_best_b_count(MpegEncContext *s){

     AVCodec *codec= avcodec_find_encoder(s->avctx->codec_id);

-    AVCodecContext *c= avcodec_alloc_context();

+    AVCodecContext *c = avcodec_alloc_context3(NULL);

     AVFrame input[FF_MAX_B_FRAMES+2];

     const int scale= s->avctx->brd_scale;

     int i, j, out_size, p_lambda, b_lambda, lambda2;

@@ -973,7 +973,7 @@ static int estimate_best_b_count(MpegEncContext *s){

     c->time_base= s->avctx->time_base;

     c->max_b_frames= s->max_b_frames;

-    if (avcodec_open(c, codec) < 0)

+    if (avcodec_open2(c, codec, NULL) < 0)

         return -1;

     for(i=0; i<s->max_b_frames+2; i++){

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

  */

 #include "avcodec.h"

+#include "internal.h"

+#include "libavutil/avassert.h"

 #include "libavutil/opt.h"

 #include <float.h>              /* FLT_MIN, FLT_MAX */

@@ -69,7 +71,7 @@ static const AVOption *opt_find(void *obj, const char *name, const char *unit, i

 static const AVOption options[]={

 {"b", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, V|E},

-{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl = 64*1000 }, INT_MIN, INT_MAX, A|E},

+{"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE }, INT_MIN, INT_MAX, A|E},

 {"bt", "set video bitrate tolerance (in bits/s)", OFFSET(bit_rate_tolerance), FF_OPT_TYPE_INT, {.dbl = AV_CODEC_DEFAULT_BITRATE*20 }, 1, INT_MAX, V|E},

 {"flags", NULL, OFFSET(flags), FF_OPT_TYPE_FLAGS, {.dbl = DEFAULT }, 0, UINT_MAX, V|A|E|D, "flags"},

 {"mv4", "use four motion vector by macroblock (mpeg4)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_4MV }, INT_MIN, INT_MAX, V|E, "flags"},

@@ -413,7 +415,9 @@ static const AVOption options[]={

 #if FF_API_REQUEST_CHANNELS

 {"request_channels", "set desired number of audio channels", OFFSET(request_channels), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, 0, INT_MAX, A|D},

 #endif

+#if FF_API_DRC_SCALE

 {"drc_scale", "percentage of dynamic range compression to apply", OFFSET(drc_scale), FF_OPT_TYPE_FLOAT, {.dbl = 1.0 }, 0.0, 1.0, A|D},

+#endif

 {"reservoir", "use bit reservoir", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_BIT_RESERVOIR }, INT_MIN, INT_MAX, A|E, "flags2"},

 {"mbtree", "use macroblock tree ratecontrol (x264 only)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_MBTREE }, INT_MIN, INT_MAX, V|E, "flags2"},

 {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX},

@@ -522,6 +526,15 @@ int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){

             av_opt_set_defaults(s->priv_data);

         }

     }

+    if (codec && codec->defaults) {

+        int ret;

+        AVCodecDefault *d = codec->defaults;

+        while (d->key) {

+            ret = av_set_string3(s, d->key, d->value, 0, NULL);

+            av_assert0(ret >= 0);

+            d++;

+        }

+    }

     return 0;

 }

@@ -538,6 +551,7 @@ AVCodecContext *avcodec_alloc_context3(AVCodec *codec){

     return avctx;

 }

+#if FF_API_ALLOC_CONTEXT

 AVCodecContext *avcodec_alloc_context2(enum AVMediaType codec_type){

     AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));

@@ -547,14 +561,17 @@ AVCodecContext *avcodec_alloc_context2(enum AVMediaType codec_type){

     return avctx;

 }

+#endif

 void avcodec_get_context_defaults(AVCodecContext *s){

     avcodec_get_context_defaults2(s, AVMEDIA_TYPE_UNKNOWN);

 }

+#if FF_API_ALLOC_CONTEXT

 AVCodecContext *avcodec_alloc_context(void){

     return avcodec_alloc_context2(AVMEDIA_TYPE_UNKNOWN);

 }

+#endif

 int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)

 {

@@ -32,6 +32,7 @@

 #include "libavutil/audioconvert.h"

 #include "libavutil/imgutils.h"

 #include "libavutil/samplefmt.h"

+#include "libavutil/dict.h"

 #include "avcodec.h"

 #include "dsputil.h"

 #include "libavutil/opt.h"

@@ -485,9 +486,20 @@ static void avcodec_get_subtitle_defaults(AVSubtitle *sub)

     sub->pts = AV_NOPTS_VALUE;

 }

+#if FF_API_AVCODEC_OPEN

 int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)

 {

+    return avcodec_open2(avctx, codec, NULL);

+}

+#endif

+

+int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)

+{

     int ret = 0;

+    AVDictionary *tmp = NULL;

+

+    if (options)

+        av_dict_copy(&tmp, *options, 0);

     /* If there is a user-supplied mutex locking routine, call it. */

     if (ff_lockmgr_cb) {

@@ -514,14 +526,18 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec)

             ret = AVERROR(ENOMEM);

             goto end;

         }

-        if(codec->priv_class){ //this can be droped once all user apps use   avcodec_get_context_defaults3()

+        if (codec->priv_class) {

             *(AVClass**)avctx->priv_data= codec->priv_class;

             av_opt_set_defaults(avctx->priv_data);

         }

       }

+      if (codec->priv_class && (ret = av_opt_set_dict(avctx->priv_data, &tmp) < 0))

+          goto free_and_end;

     } else {

         avctx->priv_data = NULL;

     }

+    if ((ret = av_opt_set_dict(avctx, &tmp)) < 0)

+        goto free_and_end;

     if(avctx->coded_width && avctx->coded_height)

         avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height);

@@ -640,8 +656,14 @@ end:

     if (ff_lockmgr_cb) {

         (*ff_lockmgr_cb)(&codec_mutex, AV_LOCK_RELEASE);

     }

+    if (options) {

+        av_dict_free(options);

+        *options = tmp;

+    }

+

     return ret;

 free_and_end:

+    av_dict_free(&tmp);

     av_freep(&avctx->priv_data);

     avctx->codec= NULL;

     goto end;

@@ -68,5 +68,14 @@

 #ifndef FF_API_GET_PIX_FMT_NAME

 #define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54)

 #endif

+#ifndef FF_API_ALLOC_CONTEXT

+#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 54)

+#endif

+#ifndef FF_API_AVCODEC_OPEN

+#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 54)

+#endif

+#ifndef FF_API_DRC_SCALE

+#define FF_API_DRC_SCALE        (LIBAVCODEC_VERSION_MAJOR < 54)

+#endif

 #endif /* AVCODEC_VERSION_H */

@@ -1783,7 +1783,7 @@ static void gmc_mmx(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int o

                     int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height)

 {

     gmc(dst, src, stride, h, ox, oy, dxx, dxy, dyx, dyy, shift, r,

-        width, height, &ff_emulated_edge_mc);

+        width, height, &ff_emulated_edge_mc_8);

 }

 #endif

@@ -141,4 +141,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o

 DIRS = x86 libmpcodecs

+TOOLS = graph2dot lavfi-showfiltfmts

+

 include $(SRC_PATH)/subdir.mak

@@ -97,7 +97,7 @@ static int movie_init(AVFilterContext *ctx)

                "Failed to avformat_open_input '%s'\n", movie->file_name);

         return ret;

     }

-    if ((ret = av_find_stream_info(movie->format_ctx)) < 0)

+    if ((ret = avformat_find_stream_info(movie->format_ctx, NULL)) < 0)

         av_log(ctx, AV_LOG_WARNING, "Failed to find stream info\n");

     // if seeking requested, we execute it

@@ -140,7 +140,7 @@ static int movie_init(AVFilterContext *ctx)

         return AVERROR(EINVAL);

     }

-    if ((ret = avcodec_open(movie->codec_ctx, codec)) < 0) {

+    if ((ret = avcodec_open2(movie->codec_ctx, codec, NULL)) < 0) {

         av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n");

         return ret;

     }

@@ -342,5 +342,6 @@ OBJS-$(CONFIG_ALSA_INDEV)                += timefilter.o

 OBJS-$(CONFIG_JACK_INDEV)                += timefilter.o

 TESTPROGS = timefilter

+TOOLS     = pktdumper probetest

 include $(SRC_PATH)/subdir.mak

@@ -1167,6 +1167,7 @@ AVFormatContext *avformat_alloc_output_context(const char *format,

 int avformat_alloc_output_context2(AVFormatContext **ctx, AVOutputFormat *oformat,

                                    const char *format_name, const char *filename);

+#if FF_API_FORMAT_PARAMETERS

 /**

  * Read packets of a media file to get stream information. This

  * is useful for file formats with no headers such as MPEG. This

@@ -1179,8 +1180,34 @@ int avformat_alloc_output_context2(AVFormatContext **ctx, AVOutputFormat *oforma

  * @return >=0 if OK, AVERROR_xxx on error

  * @todo Let the user decide somehow what information is needed so that

  *       we do not waste time getting stuff the user does not need.

+ *

+ * @deprecated use avformat_find_stream_info.

  */

 int av_find_stream_info(AVFormatContext *ic);

+#endif

+

+/**

+ * Read packets of a media file to get stream information. This

+ * is useful for file formats with no headers such as MPEG. This

+ * function also computes the real framerate in case of MPEG-2 repeat

+ * frame mode.

+ * The logical file position is not changed by this function;

+ * examined packets may be buffered for later processing.

+ *

+ * @param ic media file handle

+ * @param options  If non-NULL, an ic.nb_streams long array of pointers to

+ *                 dictionaries, where i-th member contains options for

+ *                 codec corresponding to i-th stream.

+ *                 On return each dictionary will be filled with options that were not found.

+ * @return >=0 if OK, AVERROR_xxx on error

+ *

+ * @note this function isn't guaranteed to open all the codecs, so

+ *       options being non-empty at return is a perfectly normal behavior.

+ *

+ * @todo Let the user decide somehow what information is needed so that

+ *       we do not waste time getting stuff the user does not need.

+ */

+int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options);

 /**

  * Find the "best" stream in the file.

@@ -255,6 +255,9 @@ typedef struct {

     /* What to skip before effectively reading a packet. */

     int skip_to_keyframe;

     uint64_t skip_to_timecode;

+

+    /* File has a CUES element, but we defer parsing until it is needed. */

+    int cues_parsing_deferred;

 } MatroskaDemuxContext;

 typedef struct {

@@ -1139,7 +1142,7 @@ static void matroska_convert_tags(AVFormatContext *s)

     }

 }

-static void matroska_execute_seekhead(MatroskaDemuxContext *matroska)