@@ -12,6 +12,38 @@ libavutil:   2009-03-08

 API changes, most recent first:

+2011-04-12 - lavf 52.107.0 - avio.h

+  Avio cleanup, part II - deprecate the entire URLContext API:

+    175389c add avio_check as a replacement for url_exist

+    ff1ec0c add avio_pause and avio_seek_time as replacements

+            for _av_url_read_fseek/fpause

+    cdc6a87 deprecate av_protocol_next(), avio_enum_protocols

+            should be used instead.

+    80c6e23 rename url_set_interrupt_cb->avio_set_interrupt_cb.

+    f87b1b3 rename open flags: URL_* -> AVIO_*

+    f8270bb add avio_enum_protocols.

+    5593f03 deprecate URLProtocol.

+    c486dad deprecate URLContext.

+    026e175 deprecate the typedef for URLInterruptCB

+    8e76a19 deprecate av_register_protocol2.

+    b840484 deprecate URL_PROTOCOL_FLAG_NESTED_SCHEME

+    1305d93 deprecate av_url_read_seek

+    fa104e1 deprecate av_url_read_pause

+    727c7aa deprecate url_get_filename().

+    5958df3 deprecate url_max_packet_size().

+    1869ea0 deprecate url_get_file_handle().

+    32a97d4 deprecate url_filesize().

+    e52a914 deprecate url_close().

+    58a48c6 deprecate url_seek().

+    925e908 deprecate url_write().

+    dce3756 deprecate url_read_complete().

+    bc371ac deprecate url_read().

+    0589da0 deprecate url_open().

+    62eaaea deprecate url_connect.

+    5652bb9 deprecate url_alloc.

+    333e894 deprecate url_open_protocol

+    e230705 deprecate url_poll and URLPollEntry

+

 2011-04-10 - lavu  50.40.0 - pixfmt.h

   Add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

@@ -2966,9 +2966,7 @@ typedef struct AVCodec {

     const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1

     const int64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0

     uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder

-

-    AVClass *priv_class;                    ///< AVClass for the private context

-

+    const AVClass *priv_class;              ///< AVClass for the private context

     const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}

     /**

@@ -20,6 +20,8 @@

  */

 #include "avcodec.h"

+#include "libavutil/avstring.h"

+#include "libavutil/opt.h"

 static void amr_decode_fix_avctx(AVCodecContext *avctx)

 {

@@ -40,9 +42,6 @@ static void amr_decode_fix_avctx(AVCodecContext *avctx)

 #include <opencore-amrnb/interf_dec.h>

 #include <opencore-amrnb/interf_enc.h>

-static const char nb_bitrate_unsupported[] =

-    "bitrate not supported: use one of 4.75k, 5.15k, 5.9k, 6.7k, 7.4k, 7.95k, 10.2k or 12.2k\n";

-

 /* Common code for fixed and float version*/

 typedef struct AMR_bitrates {

     int       rate;

@@ -50,41 +49,61 @@ typedef struct AMR_bitrates {

 } AMR_bitrates;

 /* Match desired bitrate */

-static int getBitrateMode(int bitrate)

+static int get_bitrate_mode(int bitrate, void *log_ctx)

 {

     /* make the correspondance between bitrate and mode */

-    AMR_bitrates rates[] = { { 4750, MR475},

-                             { 5150, MR515},

-                             { 5900, MR59},

-                             { 6700, MR67},

-                             { 7400, MR74},

-                             { 7950, MR795},

-                             {10200, MR102},

-                             {12200, MR122}, };

-    int i;

-

-    for (i = 0; i < 8; i++)

+    static const AMR_bitrates rates[] = {

+        { 4750, MR475 }, { 5150, MR515 }, {  5900, MR59  }, {  6700, MR67  },

+        { 7400, MR74 },  { 7950, MR795 }, { 10200, MR102 }, { 12200, MR122 }

+    };

+    int i, best = -1, min_diff = 0;

+    char log_buf[200];

+

+    for (i = 0; i < 8; i++) {

         if (rates[i].rate == bitrate)

             return rates[i].mode;

-    /* no bitrate matching, return an error */

-    return -1;

+        if (best < 0 || abs(rates[i].rate - bitrate) < min_diff) {

+            best     = i;

+            min_diff = abs(rates[i].rate - bitrate);

+        }

+    }

+    /* no bitrate matching exactly, log a warning */

+    snprintf(log_buf, sizeof(log_buf), "bitrate not supported: use one of ");

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

+        av_strlcatf(log_buf, sizeof(log_buf), "%.2fk, ", rates[i].rate    / 1000.f);

+    av_strlcatf(log_buf, sizeof(log_buf), "using %.2fk", rates[best].rate / 1000.f);

+    av_log(log_ctx, AV_LOG_WARNING, "%s\n", log_buf);

+

+    return best;

 }

 typedef struct AMRContext {

-    int   frameCount;

-    void *decState;

-    int  *enstate;

+    AVClass *av_class;

+    int   frame_count;

+    void *dec_state;

+    void *enc_state;

     int   enc_bitrate;

+    int   enc_mode;

+    int   enc_dtx;

 } AMRContext;

+static const AVOption options[] = {

+    { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRContext, enc_dtx), FF_OPT_TYPE_INT, 0, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },

+    { NULL }

+};

+

+static const AVClass class = {

+    "libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT

+};

+

 static av_cold int amr_nb_decode_init(AVCodecContext *avctx)

 {

-    AMRContext *s = avctx->priv_data;

+    AMRContext *s  = avctx->priv_data;

-    s->frameCount = 0;

-    s->decState   = Decoder_Interface_init();

-    if (!s->decState) {

-        av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\r\n");

+    s->frame_count = 0;

+    s->dec_state   = Decoder_Interface_init();

+    if (!s->dec_state) {

+        av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\n");

         return -1;

     }

@@ -92,7 +111,7 @@ static av_cold int amr_nb_decode_init(AVCodecContext *avctx)

     if (avctx->channels > 1) {

         av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n");

-        return -1;

+        return AVERROR(ENOSYS);

     }

     return 0;

@@ -102,7 +121,7 @@ static av_cold int amr_nb_decode_close(AVCodecContext *avctx)

 {

     AMRContext *s = avctx->priv_data;

-    Decoder_Interface_exit(s->decState);

+    Decoder_Interface_exit(s->dec_state);

     return 0;

 }

@@ -111,29 +130,28 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data,

 {

     const uint8_t *buf = avpkt->data;

     int buf_size       = avpkt->size;

-    AMRContext *s = avctx->priv_data;

-    const uint8_t *amrData = buf;

+    AMRContext *s      = avctx->priv_data;

     static const uint8_t block_size[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };

     enum Mode dec_mode;

     int packet_size;

-    /* av_log(NULL, AV_LOG_DEBUG, "amr_decode_frame buf=%p buf_size=%d frameCount=%d!!\n",

-              buf, buf_size, s->frameCount); */

+    av_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n",

+            buf, buf_size, s->frame_count);

-    dec_mode = (buf[0] >> 3) & 0x000F;

+    dec_mode    = (buf[0] >> 3) & 0x000F;

     packet_size = block_size[dec_mode] + 1;

     if (packet_size > buf_size) {

         av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",

                buf_size, packet_size);

-        return -1;

+        return AVERROR_INVALIDDATA;

     }

-    s->frameCount++;

-    /* av_log(NULL, AV_LOG_DEBUG, "packet_size=%d amrData= 0x%X %X %X %X\n",

-              packet_size, amrData[0], amrData[1], amrData[2], amrData[3]); */

+    s->frame_count++;

+    av_dlog(avctx, "packet_size=%d buf= 0x%X %X %X %X\n",

+              packet_size, buf[0], buf[1], buf[2], buf[3]);

     /* call decoder */

-    Decoder_Interface_Decode(s->decState, amrData, data, 0);

+    Decoder_Interface_Decode(s->dec_state, buf, data, 0);

     *data_size = 160 * 2;

     return packet_size;

@@ -155,31 +173,29 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx)

 {

     AMRContext *s = avctx->priv_data;

-    s->frameCount = 0;

+    s->frame_count = 0;

     if (avctx->sample_rate != 8000) {

         av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");

-        return -1;

+        return AVERROR(ENOSYS);

     }

     if (avctx->channels != 1) {

         av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");

-        return -1;

+        return AVERROR(ENOSYS);

     }

     avctx->frame_size  = 160;

     avctx->coded_frame = avcodec_alloc_frame();

-    s->enstate=Encoder_Interface_init(0);

-    if (!s->enstate) {

+    s->enc_state = Encoder_Interface_init(s->enc_dtx);

+    if (!s->enc_state) {

         av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n");

         return -1;

     }

-    if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {

-        av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);

-        return -1;

-    }

+    s->enc_mode    = get_bitrate_mode(avctx->bit_rate, avctx);

+    s->enc_bitrate = avctx->bit_rate;

     return 0;

 }

@@ -188,7 +204,7 @@ static av_cold int amr_nb_encode_close(AVCodecContext *avctx)

 {

     AMRContext *s = avctx->priv_data;

-    Encoder_Interface_exit(s->enstate);

+    Encoder_Interface_exit(s->enc_state);

     av_freep(&avctx->coded_frame);

     return 0;

 }

@@ -200,15 +216,15 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,

     AMRContext *s = avctx->priv_data;

     int written;

-    if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {

-        av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);

-        return -1;

+    if (s->enc_bitrate != avctx->bit_rate) {

+        s->enc_mode    = get_bitrate_mode(avctx->bit_rate, avctx);

+        s->enc_bitrate = avctx->bit_rate;

     }

-    written = Encoder_Interface_Encode(s->enstate, s->enc_bitrate, data,

+    written = Encoder_Interface_Encode(s->enc_state, s->enc_mode, data,

                                        frame, 0);

-    /* av_log(NULL, AV_LOG_DEBUG, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",

-              written, s->enc_bitrate, frame[0] ); */

+    av_dlog(avctx, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",

+            written, s->enc_mode, frame[0]);

     return written;

 }

@@ -224,6 +240,7 @@ AVCodec ff_libopencore_amrnb_encoder = {

     NULL,

     .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},

     .long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),

+    .priv_class = &class,

 };

 #endif

@@ -231,42 +248,24 @@ AVCodec ff_libopencore_amrnb_encoder = {

 /* -----------AMR wideband ------------*/

 #if CONFIG_LIBOPENCORE_AMRWB

-#ifdef _TYPEDEF_H

-//To avoid duplicate typedefs from typedef in amr-nb

-#define typedef_h

-#endif

-

 #include <opencore-amrwb/dec_if.h>

 #include <opencore-amrwb/if_rom.h>

-static const char wb_bitrate_unsupported[] =

-    "bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, 18.25k, 19.85k, 23.05k, or 23.85k\n";

-

-/* Common code for fixed and float version*/

-typedef struct AMRWB_bitrates {

-    int rate;

-    int mode;

-} AMRWB_bitrates;

-

 typedef struct AMRWBContext {

-    int    frameCount;

     void  *state;

-    int    mode;

-    Word16 allow_dtx;

 } AMRWBContext;

 static av_cold int amr_wb_decode_init(AVCodecContext *avctx)

 {

     AMRWBContext *s = avctx->priv_data;

-    s->frameCount = 0;

-    s->state      = D_IF_init();

+    s->state        = D_IF_init();

     amr_decode_fix_avctx(avctx);

     if (avctx->channels > 1) {

         av_log(avctx, AV_LOG_ERROR, "amr_wb: multichannel decoding not supported\n");

-        return -1;

+        return AVERROR(ENOSYS);

     }

     return 0;

@@ -277,8 +276,7 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,

 {

     const uint8_t *buf = avpkt->data;

     int buf_size       = avpkt->size;

-    AMRWBContext *s = avctx->priv_data;

-    const uint8_t *amrData = buf;

+    AMRWBContext *s    = avctx->priv_data;

     int mode;

     int packet_size;

     static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};

@@ -287,17 +285,16 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data,

         /* nothing to do */

         return 0;

-    mode = (amrData[0] >> 3) & 0x000F;

+    mode        = (buf[0] >> 3) & 0x000F;

     packet_size = block_size[mode];

     if (packet_size > buf_size) {

         av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",

                buf_size, packet_size + 1);

-        return -1;

+        return AVERROR_INVALIDDATA;

     }

-    s->frameCount++;

-    D_IF_decode(s->state, amrData, data, _good_frame);

+    D_IF_decode(s->state, buf, data, _good_frame);

     *data_size = 320 * 2;

     return packet_size;

 }

@@ -62,12 +62,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)

         return AVERROR_UNKNOWN;

     }

-    avctx->extradata_size = 2;

-    avctx->extradata      = av_mallocz(avctx->extradata_size +

-                                       FF_INPUT_BUFFER_PADDING_SIZE);

-    if (!avctx->extradata)

-        return AVERROR(ENOMEM);

-

     for (index = 0; index < 16; index++)

         if (avctx->sample_rate == ff_mpeg4audio_sample_rates[index])

             break;

@@ -76,8 +70,16 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)

                                     avctx->sample_rate);

         return AVERROR_NOTSUPP;

     }

-    avctx->extradata[0] = 0x02 << 3 | index >> 1;

-    avctx->extradata[1] = (index & 0x01) << 7 | avctx->channels << 3;

+    if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {

+        avctx->extradata_size = 2;

+        avctx->extradata      = av_mallocz(avctx->extradata_size +

+                                           FF_INPUT_BUFFER_PADDING_SIZE);

+        if (!avctx->extradata)

+            return AVERROR(ENOMEM);

+

+        avctx->extradata[0] = 0x02 << 3 | index >> 1;

+        avctx->extradata[1] = (index & 0x01) << 7 | avctx->channels << 3;

+    }

     return 0;

 }

@@ -123,6 +125,6 @@ AVCodec ff_libvo_aacenc_encoder = {

     aac_encode_close,

     NULL,

     .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},

-    .long_name = NULL_IF_CONFIG_SMALL("VisualOn libvo-aacenc AAC"),

+    .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),

 };

@@ -22,41 +22,50 @@

 #include <vo-amrwbenc/enc_if.h>

 #include "avcodec.h"

-

-static const char wb_bitrate_unsupported[] =

-    "bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, "

-    "18.25k, 19.85k, 23.05k, or 23.85k\n";

-

-typedef struct AMRWB_bitrates {

-    int rate;

-    int mode;

-} AMRWB_bitrates;

+#include "libavutil/avstring.h"

+#include "libavutil/opt.h"

 typedef struct AMRWBContext {

+    AVClass *av_class;

     void  *state;

     int    mode;

+    int    last_bitrate;

     int    allow_dtx;

 } AMRWBContext;

-static int getWBBitrateMode(int bitrate)

+static const AVOption options[] = {

+    { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRWBContext, allow_dtx), FF_OPT_TYPE_INT, 0, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },

+    { NULL }

+};

+

+static const AVClass class = {

+    "libvo_amrwbenc", av_default_item_name, options, LIBAVUTIL_VERSION_INT

+};

+

+static int get_wb_bitrate_mode(int bitrate, void *log_ctx)

 {

     /* make the correspondance between bitrate and mode */

-    AMRWB_bitrates rates[] = { { 6600, 0},

-                               { 8850, 1},

-                               {12650, 2},

-                               {14250, 3},

-                               {15850, 4},

-                               {18250, 5},

-                               {19850, 6},

-                               {23050, 7},

-                               {23850, 8}, };

-    int i;

-

+    static const int rates[] = {  6600,  8850, 12650, 14250, 15850, 18250,

+                                 19850, 23050, 23850 };

+    int i, best = -1, min_diff = 0;

+    char log_buf[200];

+

+    for (i = 0; i < 9; i++) {

+        if (rates[i] == bitrate)

+            return i;

+        if (best < 0 || abs(rates[i] - bitrate) < min_diff) {

+            best     = i;

+            min_diff = abs(rates[i] - bitrate);

+        }

+    }

+    /* no bitrate matching exactly, log a warning */

+    snprintf(log_buf, sizeof(log_buf), "bitrate not supported: use one of ");

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

-        if (rates[i].rate == bitrate)

-            return rates[i].mode;

-    /* no bitrate matching, return an error */

-    return -1;

+        av_strlcatf(log_buf, sizeof(log_buf), "%.2fk, ", rates[i]    / 1000.f);

+    av_strlcatf(log_buf, sizeof(log_buf), "using %.2fk", rates[best] / 1000.f);

+    av_log(log_ctx, AV_LOG_WARNING, "%s\n", log_buf);

+

+    return best;

 }

 static av_cold int amr_wb_encode_init(AVCodecContext *avctx)

@@ -65,24 +74,21 @@ static av_cold int amr_wb_encode_init(AVCodecContext *avctx)

     if (avctx->sample_rate != 16000) {

         av_log(avctx, AV_LOG_ERROR, "Only 16000Hz sample rate supported\n");

-        return -1;

+        return AVERROR(ENOSYS);

     }

     if (avctx->channels != 1) {

         av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");

-        return -1;

+        return AVERROR(ENOSYS);

     }

-    if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) {

-        av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported);

-        return -1;

-    }

+    s->mode            = get_wb_bitrate_mode(avctx->bit_rate, avctx);

+    s->last_bitrate    = avctx->bit_rate;

     avctx->frame_size  = 320;

     avctx->coded_frame = avcodec_alloc_frame();

     s->state     = E_IF_init();

-    s->allow_dtx = 0;

     return 0;

 }

@@ -103,9 +109,9 @@ static int amr_wb_encode_frame(AVCodecContext *avctx,

     AMRWBContext *s = avctx->priv_data;

     int size;

-    if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) {

-        av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported);

-        return -1;

+    if (s->last_bitrate != avctx->bit_rate) {

+        s->mode         = get_wb_bitrate_mode(avctx->bit_rate, avctx);

+        s->last_bitrate = avctx->bit_rate;

     }

     size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx);

     return size;

@@ -121,7 +127,8 @@ AVCodec ff_libvo_amrwbenc_encoder = {

     amr_wb_encode_close,

     NULL,

     .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},

-    .long_name = NULL_IF_CONFIG_SMALL("VisualOn libvo-amrwbenc Adaptive Multi-Rate "

+    .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive Multi-Rate "

                                       "(AMR) Wide-Band"),

+    .priv_class = &class,

 };

@@ -1279,7 +1279,8 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)

     int i;

     MVTable *mv;

-    ff_h263_decode_init(avctx);

+    if (ff_h263_decode_init(avctx) < 0)

+        return -1;

     common_init(s);

@@ -66,10 +66,10 @@

 #define FF_API_INOFFICIAL       (LIBAVCODEC_VERSION_MAJOR < 53)

 #endif

 #ifndef FF_API_OLD_SAMPLE_FMT

-#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 53)

+#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 54)

 #endif

 #ifndef FF_API_OLD_AUDIOCONVERT

-#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 53)

+#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)

 #endif

 #ifndef FF_API_HURRY_UP

 #define FF_API_HURRY_UP         (LIBAVCODEC_VERSION_MAJOR < 53)

@@ -84,7 +84,7 @@

 #define FF_API_ANTIALIAS_ALGO   (LIBAVCODEC_VERSION_MAJOR < 54)

 #endif

 #ifndef FF_API_REQUEST_CHANNELS

-#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 53)

+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 54)

 #endif

 #endif /* AVCODEC_VERSION_H */

@@ -309,10 +309,13 @@ reload:

     c->end_of_segment = 1;

     c->cur_seq_no = v->cur_seq_no;

-    v->needed = 0;

-    for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams; i++) {

-        if (v->parent->streams[i]->discard < AVDISCARD_ALL)

-            v->needed = 1;

+    if (v->ctx) {

+        v->needed = 0;

+        for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams;

+             i++) {

+            if (v->parent->streams[i]->discard < AVDISCARD_ALL)

+                v->needed = 1;

+        }

     }

     if (!v->needed) {

         av_log(v->parent, AV_LOG_INFO, "No longer receiving variant %d\n",

@@ -317,7 +317,7 @@ typedef struct AVOutputFormat {

     enum CodecID subtitle_codec; /**< default subtitle codec */

-#if FF_API_OLD_METADATA

+#if FF_API_OLD_METADATA2

     const AVMetadataConv *metadata_conv;

 #endif

@@ -437,7 +437,7 @@ typedef struct AVInputFormat {

      */

     int (*read_seek2)(struct AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags);

-#if FF_API_OLD_METADATA

+#if FF_API_OLD_METADATA2

     const AVMetadataConv *metadata_conv;

 #endif

@@ -363,6 +363,7 @@ int ffurl_close(URLContext *h)

     return ret;

 }

+#if FF_API_OLD_AVIO

 int url_exist(const char *filename)

 {

     URLContext *h;

@@ -371,6 +372,26 @@ int url_exist(const char *filename)

     ffurl_close(h);

     return 1;

 }

+#endif

+

+int avio_check(const char *url, int flags)

+{

+    URLContext *h;

+    int ret = ffurl_alloc(&h, url, flags);

+    if (ret)

+        return ret;

+

+    if (h->prot->url_check) {

+        ret = h->prot->url_check(h, flags);

+    } else {

+        ret = ffurl_connect(h);

+        if (ret >= 0)

+            ret = flags;

+    }

+

+    ffurl_close(h);

+    return ret;

+}

 int64_t ffurl_size(URLContext *h)

 {

@@ -134,6 +134,7 @@ typedef struct URLProtocol {

     int priv_data_size;

     const AVClass *priv_data_class;

     int flags;

+    int (*url_check)(URLContext *h, int mask);

 } URLProtocol;

 typedef struct URLPollEntry {

@@ -335,13 +336,31 @@ attribute_deprecated int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_siz

 /** return the written or read size */

 attribute_deprecated int url_close_buf(AVIOContext *s);

-#endif // FF_API_OLD_AVIO

 /**

  * Return a non-zero value if the resource indicated by url

  * exists, 0 otherwise.

+ * @deprecated Use avio_check instead.

  */

-int url_exist(const char *url);

+attribute_deprecated int url_exist(const char *url);

+#endif // FF_API_OLD_AVIO

+

+/**

+ * Return AVIO_* access flags corresponding to the access permissions

+ * of the resource in url, or a negative value corresponding to an

+ * AVERROR code in case of failure. The returned access flags are

+ * masked by the value in flags.

+ *

+ * @note This function is intrinsically unsafe, in the sense that the

+ * checked resource may change its existence or permission status from

+ * one call to another. Thus you should not trust the returned value,

+ * unless you are sure that no other processes are accessing the

+ * checked resource.

+ *

+ * @note This function is slightly broken until next major bump

+ *       because of AVIO_RDONLY == 0. Don't use it until then.

+ */

+int avio_check(const char *url, int flags);

 /**

  * The callback is called in blocking functions to test regulary if

@@ -537,9 +556,15 @@ int url_resetbuf(AVIOContext *s, int flags);

  * constants, optionally ORed with other flags.

  * @{

  */

+#if LIBAVFORMAT_VERSION_MAJOR < 53

 #define AVIO_RDONLY 0  /**< read-only */

 #define AVIO_WRONLY 1  /**< write-only */

 #define AVIO_RDWR   2  /**< read-write */

+#else

+#define AVIO_RDONLY 1  /**< read-only */

+#define AVIO_WRONLY 2  /**< write-only */

+#define AVIO_RDWR   4  /**< read-write */

+#endif

 /**

  * @}

  */

@@ -556,7 +581,11 @@ int url_resetbuf(AVIOContext *s, int flags);

  * Warning: non-blocking protocols is work-in-progress; this flag may be

  * silently ignored.

  */

+#if LIBAVFORMAT_VERSION_MAJOR < 53

 #define AVIO_FLAG_NONBLOCK 4

+#else

+#define AVIO_FLAG_NONBLOCK 8

+#endif

 /**

  * Create and initialize a AVIOContext for accessing the

@@ -95,6 +95,20 @@ static int file_close(URLContext *h)

     return close(fd);

 }

+static int file_check(URLContext *h, int mask)

+{

+    struct stat st;

+    int ret = stat(h->filename, &st);

+    if (ret < 0)

+        return AVERROR(errno);

+

+    ret |= st.st_mode&S_IRUSR ? mask&AVIO_RDONLY : 0;

+    ret |= st.st_mode&S_IWUSR ? mask&AVIO_WRONLY : 0;

+    ret |= st.st_mode&S_IWUSR && st.st_mode&S_IRUSR ? mask&AVIO_RDWR : 0;

+

+    return ret;

+}

+

 URLProtocol ff_file_protocol = {

     .name                = "file",

     .url_open            = file_open,

@@ -103,6 +117,7 @@ URLProtocol ff_file_protocol = {

     .url_seek            = file_seek,

     .url_close           = file_close,

     .url_get_file_handle = file_get_handle,

+    .url_check           = file_check,

 };

 #endif /* CONFIG_FILE_PROTOCOL */

@@ -137,6 +152,7 @@ URLProtocol ff_pipe_protocol = {

     .url_read            = file_read,

     .url_write           = file_write,

     .url_get_file_handle = file_get_handle,

+    .url_check           = file_check,

 };

 #endif /* CONFIG_PIPE_PROTOCOL */

@@ -59,6 +59,7 @@ typedef struct URLProtocol {

     int priv_data_size;

     const AVClass *priv_data_class;

     int flags;

+    int (*url_check)(URLContext *h, int mask);

 } URLProtocol;

 #endif

@@ -3086,7 +3086,10 @@ static int ff_interleave_compare_dts(AVFormatContext *s, AVPacket *next, AVPacke

     AVStream *st2= s->streams[ next->stream_index];

     int64_t a= st2->time_base.num * (int64_t)st ->time_base.den;

     int64_t b= st ->time_base.num * (int64_t)st2->time_base.den;

-    return av_rescale_rnd(pkt->dts, b, a, AV_ROUND_DOWN) < next->dts;

+    int64_t dts1 = av_rescale_rnd(pkt->dts, b, a, AV_ROUND_DOWN);

+    if (dts1==next->dts && dts1==av_rescale_rnd(pkt->dts, b, a, AV_ROUND_UP))

+        return pkt->stream_index < next->stream_index;

+    return dts1 < next->dts;

 }

 int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush){

@@ -24,7 +24,7 @@

 #include "libavutil/avutil.h"

 #define LIBAVFORMAT_VERSION_MAJOR 52

-#define LIBAVFORMAT_VERSION_MINOR 106

+#define LIBAVFORMAT_VERSION_MINOR 107

 #define LIBAVFORMAT_VERSION_MICRO  0

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

@@ -30,8 +30,6 @@

 #include "swscale.h"

 #include "swscale_internal.h"

-#define FAST_BGR2YV12 // use 7-bit instead of 15-bit coefficients

-

 void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, long src_size);

 void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);

 void (*rgb24tobgr15)(const uint8_t *src, uint8_t *dst, long src_size);

@@ -77,8 +77,6 @@ untested special converters

 //#undef ARCH_X86

 #define DITHER1XBPP

-#define FAST_BGR2YV12 // use 7 bit coefficients instead of 15 bit

-

 #define isPacked(x)         (       \

            (x)==PIX_FMT_PAL8        \

         || (x)==PIX_FMT_YUYV422     \

@@ -31,6 +31,8 @@

 #define STR(s)         AV_TOSTRING(s) //AV_STRINGIFY is too long

+#define FAST_BGR2YV12 //use 7-bit instead of 15-bit coefficients

+

 #define MAX_FILTER_SIZE 256

 #if ARCH_X86

@@ -1,5 +1,5 @@

-1, 0, 2048, 0x3d042426

 0, 0, 259200, 0x7e91df07

+1, 0, 2048, 0x3d042426

 1, 4180, 2048, 0x5bcae456

 0, 7200, 259200, 0x7e91df07

 1, 8359, 2048, 0xb6043655

@@ -1,5 +1,5 @@

-1, 0, 1480, 0x00000000

 0, 0, 192000, 0x00000000

+1, 0, 1480, 0x00000000

 0, 1500, 192000, 0x01a6cf45

 0, 3000, 192000, 0xd07d57e9

 0, 4500, 192000, 0x3cb1dff5

@@ -1,5 +1,5 @@

-1, 0, 17768, 0x07df135c

 0, 0, 134400, 0xc218b00c

+1, 0, 17768, 0x07df135c

 0, 10000, 134400, 0x114daf7c

 0, 20000, 134400, 0xe14db24c

 0, 30000, 134400, 0x88c71df7

@@ -1,5 +1,5 @@

-1, 0, 11026, 0x27ad637c

 0, 0, 230400, 0x03e25ead

+1, 0, 11026, 0x27ad637c

 0, 6000, 230400, 0x0a520ffd

 0, 12000, 230400, 0x0b11a671

 0, 18000, 230400, 0x7d3fce32

@@ -1,5 +1,5 @@

-1, 0, 16372, 0xfaaab59d

 0, 0, 188892, 0xcb5be3dd

+1, 0, 16372, 0xfaaab59d

 0, 6000, 188892, 0x0f313ebc

 0, 12000, 188892, 0xc0da25cc

 0, 18000, 188892, 0xad6e1d44

@@ -1,5 +1,5 @@

-1, 0, 1000, 0x64cd9403

 0, 0, 921600, 0x0d03844f

+1, 0, 1000, 0x64cd9403

 1, 4082, 1000, 0xa4ef8a9d

 1, 8163, 1000, 0x75c19868

 0, 9000, 921600, 0x0d03844f

@@ -1,5 +1,5 @@

-1, 0, 88192, 0x23bb50ae

 0, 0, 107520, 0xa6c9fdd2

+1, 0, 88192, 0x23bb50ae

 0, 3000, 107520, 0x61eb28c1

 0, 6000, 107520, 0x45e20af7