gmane.comp.video.libav.devel

[PATCH 1/5] avconv: split configuring input filtersout of configure_complex_filter

Anton Khirnov — 2012-05-26T14:54:22

---
 avconv.c |   98 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 37 deletions(-)

diff --git a/avconv.c b/avconv.c
index 5506869..850f591 100644
--- a/avconv.c
+++ b/avconv.c
< at >< at > -1119,6 +1119,65 < at >< at > static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFil
     }
 }
 
+static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
+                                        AVFilterInOut *in)
+{
+    AVFilter *filter = avfilter_get_by_name("buffer");
+    InputStream *ist = ifilter->ist;
+    AVRational sar;
+    char args[255];
+    int ret;
+
+    sar = ist->st->sample_aspect_ratio.num ?
+          ist->st->sample_aspect_ratio :
+          ist->st->codec->sample_aspect_ratio;
+    snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width,
+             ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE,
+             sar.num, sar.den);
+
+    if ((ret = avfilter_graph_create_filter(&ifilt

[PATCH] opt: Add AV_OPT_TYPE_INT32

Martin Storsjö — 2012-05-26T10:32:29

This is a safety precaution for options where the variable is
an integer explicitly sized to 32 bit, if we were to be built on
a platform with 64 bit integers.
---
What do people think, is this worthwhile?

 doc/APIchanges     |    3 +++
 libavutil/avutil.h |    2 +-
 libavutil/opt.c    |   10 ++++++++++
 libavutil/opt.h    |    2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 18105c5..e1f66d5 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
< at >< at > -13,6 +13,9 < at >< at > libavutil:     2011-04-18
 
 API changes, most recent first:
 
+2012-05-xx - xxxxxxx - lavu 51.31.0
+  Add AV_OPT_TYPE_INT32 and av_opt_eval_int32
+
 2012-05-xx - xxxxxxx - lavf 54.3.0
   Add AVFMT_TS_NONSTRICT format flag to indicate that a muxer supports
   non-increasing monotone timestamps.
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 3e51357..1c8e076 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
< at >< at > -152,7 +152,7 < at >< at >
  */
 
 #define LIBAVUTIL_VERSION_MAJOR 51
-#define

[PATCH] rtsp: Check for dynamic payload handlers ifno static payload mapping was found

Martin Storsjö — 2012-05-26T09:40:48

Some systems seem to abuse the static payload types 35 or 36
(which according to IANA are unassigned) for H264.
---
 libavformat/rtsp.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 963d467..367181d 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
< at >< at > -198,7 +198,14 < at >< at > static int sdp_parse_rtpmap(AVFormatContext *s,
      * particular servers ("RealServer Version 6.1.3.970", see issue 1658)
      * have a trailing space. */
     get_word_sep(buf, sizeof(buf), "/ ", &p);
-    if (payload_type >= RTP_PT_PRIVATE) {
+    if (payload_type < RTP_PT_PRIVATE) {
+        /* We are in a standard case
+         * (from http://www.iana.org/assignments/rtp-parameters). */
+        /* search into AVRtpPayloadTypes[] */
+        codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type);
+    }
+
+    if (codec->codec_id == CODEC_ID_NONE) {
         RTPDynamicProtocolHandler *handler =
             ff_rtp_handler_find_by_name(buf, co

[PATCH 1/2] avprobe: fix formatting.

Anton Khirnov — 2012-05-26T06:55:53

---
 avprobe.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index ae2eb20..acf0ab9 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -775,8 +775,7 < at >< at > static int opt_output_format(const char *opt, const char *arg)
 
         print_integer = json_print_integer;
         print_string  = json_print_string;
-    } else
-    if (!strcmp(arg, "ini")) {
+    } else if (!strcmp(arg, "ini")) {
         print_header        = ini_print_header;
         print_footer        = ini_print_footer;
         print_array_header  = ini_print_array_header;

[PATCH] log: make colored output more colorful.

Anton Khirnov — 2012-05-26T06:25:35

Green for verbose, cyan for debug.
---
Windows part untested, I'd appreciate it if someone could do that.
---
 libavutil/log.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/log.c b/libavutil/log.c
index 2969355..5e84129 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
< at >< at > -35,13 +35,13 < at >< at > static int flags;
 
 #if defined(_WIN32) && !defined(__MINGW32CE__)
 #include <windows.h>
-static const uint8_t color[] = { 12, 12, 12, 14, 7, 7, 7 };
+static const uint8_t color[] = { 12, 12, 12, 14, 7, 10, 11 };
 static int16_t background, attr_orig;
 static HANDLE con;
 #define set_color(x)  SetConsoleTextAttribute(con, background | color[x])
 #define reset_color() SetConsoleTextAttribute(con, attr_orig)
 #else
-static const uint8_t color[] = { 0x41, 0x41, 0x11, 0x03, 9, 9, 9 };
+static const uint8_t color[] = { 0x41, 0x41, 0x11, 0x03, 9, 0x02, 0x06 };
 #define set_color(x)  fprintf(stderr, "\033[%d;3%dm", color[x] >> 4, color[x]&15)
 #define reset_color() fprintf(stderr, "\033[0m"

[PATCH] avprobe: fix function prototype

Luca Barbato — 2012-05-25T22:21:04

make opt_output_format return the correct value.
---
 avprobe.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 5313894..3015763 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -757,7 +757,7 < at >< at > static int opt_format(const char *opt, const char *arg)
     return 0;
 }
 
-static void opt_output_format(const char *opt, const char *arg)
+static int opt_output_format(const char *opt, const char *arg)
 {
 
     if (!strcmp(arg, "json")) {
< at >< at > -781,8 +781,9 < at >< at > static void opt_output_format(const char *opt, const char *arg)
         print_string  = ini_print_string;
     } else {
         av_log(NULL, AV_LOG_ERROR, "Unsupported formatter %s\n", arg);
-        exit(1);
+        return AVERROR(EINVAL);
     }
+    return 0;
 }
 
 static int opt_show_format_entry(const char *opt, const char *arg)
< at >< at > -835,7 +836,7 < at >< at > static void opt_pretty(void)
 static const OptionDef options[] = {
 #include "cmdutils_common_opts.h"
     { "f", HAS_ARG, {(void*)opt_format}, "force for

[PATCH] rtpenc: Expose the ssrc as an avoption

Martin Storsjö — 2012-05-25T22:03:10

This allows the caller to set it, and allows the caller to query
what it was set to.
---
 libavformat/rtpenc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 29fc2f4..71eeb7e 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
< at >< at > -33,6 +33,7 < at >< at >
 static const AVOption options[] = {
     FF_RTP_FLAG_OPTS(RTPMuxContext, flags)
     { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.dbl = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },
+    { "ssrc", "Stream identifier", offsetof(RTPMuxContext, ssrc), AV_OPT_TYPE_INT, { 0 }, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
     { NULL },
 };
 
< at >< at > -101,7 +102,8 < at >< at > static int rtp_write_header(AVFormatContext *s1)
     s->base_timestamp = av_get_random_seed();
     s->timestamp = s->base_timestamp;
     s->cur_timestamp = 0;
-    s->ssrc = av_get_random_seed();
+    if (!s->ssrc)
+        s->ssrc = av_get_random_seed();
     s->firs

[PATCH 1/3] rtpenc_chain: Free the URLContext onfailure

Martin Storsjö — 2012-05-25T22:00:03

If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.
---
 libavformat/rtpenc_chain.c |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 16b38d6..3b5ea6c 100644
--- a/libavformat/rtpenc_chain.c
+++ b/libavformat/rtpenc_chain.c
< at >< at > -28,25 +28,23 < at >< at >
 AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
                                        URLContext *handle, int packet_size)
 {
-    AVFormatContext *rtpctx;
+    AVFormatContext *rtpctx = NULL;
     int ret;
     AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
     uint8_t *rtpflags;
     AVDictionary *opts = NULL;
 
     if (!rtp_format)
-        return NULL;
+        goto fail;
 
     /* Allocate an AVFormatContext for each output stream */
     rtpctx = avformat_alloc_context();
     if (!rtpctx)
-        re

[PATCH 1/3] avprobe: improve formatting

Luca Barbato — 2012-05-25T19:22:27

Do not use decimals if not needed.
---
 avprobe.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 6182875..5df6937 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -90,11 +90,12 < at >< at > static char *value_string(char *buf, int buf_size, double val, const char *unit)
             val  /= pow(10, index * 3);
             prefix_string = decimal_unit_prefixes[index];
         }
-
-        snprintf(buf, buf_size, "%.3f %s%s", val, prefix_string,
+        snprintf(buf, buf_size, "%.*f%s%s",
+                 index ? 3 : 0, val,
+                 prefix_string,
                  show_value_unit ? unit : "");
     } else {
-        snprintf(buf, buf_size, "%f %s", val, show_value_unit ? unit : "");
+        snprintf(buf, buf_size, "%f%s", val, show_value_unit ? unit : "");
     }
 
     return buf;

[PATCH] cosmetics: Fix indentation

Martin Storsjö — 2012-05-25T19:16:19

---
 libavformat/sapenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index ca133f5..0c3e95e 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
< at >< at > -209,7 +209,7 < at >< at > static int sap_write_header(AVFormatContext *s)
     pos += strlen(&sap->ann[pos]) + 1;
 
     if (av_sdp_create(contexts, s->nb_streams, &sap->ann[pos],
-                       sap->ann_size - pos)) {
+                      sap->ann_size - pos)) {
         ret = AVERROR_INVALIDDATA;
         goto fail;
     }

[PATCH] avprobe: display the codec profile inshow_stream()

Christian Schmidt — 2012-05-25T12:14:32

From: Christian <schmidt-IABvq36EpHazQB+pC5nmwQ< at >public.gmane.org>

---
 avprobe.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/avprobe.c b/avprobe.c
index 6182875..99e9920 100644
--- a/avprobe.c
+++ b/avprobe.c
< at >< at > -177,6 +177,7 < at >< at > static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
     AVCodecContext *dec_ctx;
     AVCodec *dec;
     char val_str[128];
+    const char * profile;
     AVDictionaryEntry *tag = NULL;
     AVRational display_aspect_ratio;
 
< at >< at > -201,6 +202,10 < at >< at > static void show_stream(AVFormatContext *fmt_ctx, int stream_idx)
         printf("codec_tag_string=%s\n", val_str);
         printf("codec_tag=0x%04x\n", dec_ctx->codec_tag);
 
+        /* print profile, if there is one */
+        if (dec && (profile = av_get_profile_name(dec, dec_ctx->profile)))
+            printf ("profile=%s\n", profile);
+
         switch (dec_ctx->codec_type) {
         case AVMEDIA_TYPE_VIDEO:
             printf("width=%d\n", dec_ctx->width);

[PATCH] http: Add support for using persistentconnections

Samuel Pitoiset — 2012-05-25T10:37:18

Add 'multiple_request' a new AVOption which indicates if we want to
use persistent connections (ie. Connection: keep-alive)
---
 libavformat/http.c |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index f978dc1..f448506 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
< at >< at > -53,6 +53,7 < at >< at > typedef struct {
     int chunked_post;
     int end_chunked_post;   /**< A flag which indicates if the end of chunked encoding has been sent. */
     int end_header;         /**< A flag which indicates we have finished to read POST reply. */
+    int multiple_request;   /**< A flag which indicates if we use persistent connections. */
 } HTTPContext;
 
 #define OFFSET(x) offsetof(HTTPContext, x)
< at >< at > -61,6 +62,7 < at >< at > typedef struct {
 static const AVOption options[] = {
 {"chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, {.dbl = 1}, 0, 1, E },
 {"headers", "custom HTTP headers, can override built i

[PATCH] opt: Add av_opt_set_bin(),a new function which sets binary data via AVOptions

Samuel Pitoiset — 2012-05-24T16:54:55

---
 libavutil/opt.c |   28 ++++++++++++++++++++++++++++
 libavutil/opt.h |    1 +
 2 files changed, 29 insertions(+)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 7c53024..1bee3a3 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
< at >< at > -316,6 +316,34 < at >< at > int av_opt_set_q(void *obj, const char *name, AVRational val, int search_flags)
     return set_number(obj, name, val.num, val.den, 1, search_flags);
 }
 
+int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int search_flags)
+{
+    void *target_obj;
+    const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj);
+    uint8_t *ptr;
+    uint8_t **dst;
+    int *lendst;
+
+    if (!o || !target_obj)
+        return AVERROR_OPTION_NOT_FOUND;
+
+    if (o->type != AV_OPT_TYPE_BINARY)
+        return AVERROR(EINVAL);
+
+    ptr = av_malloc(len);
+    if (!ptr)
+        return AVERROR(ENOMEM);
+
+    dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset);
+    lendst = (int *)(dst + 1);
+
+    *dst = ptr;
+

Convert a video

Bernhard Pöchtrager — 2012-05-24T14:31:10

Hello!
I want to change the libavformat/output-example.c to convert a video.
I add a new parameter. (forexample: ./output-example out.flv in.mpg) But
the problem is how to get the information of the file?
I think I need to get it in the variable  AVStream *video_st;
I searched in the source-code, but I couldn't find a way to load the
information.

    for (;;) {
        /* Compute current audio and video time. */
        if (audio_st)
            audio_pts = (double)audio_st->pts.val * audio_st->time_base.num
/ audio_st->time_base.den;
        else
            audio_pts = 0.0;

        if (video_st)
            video_pts = (double)video_st->pts.val * video_st->time_base.num
/
                        video_st->time_base.den;
        else
            video_pts = 0.0;

        if ((!audio_st || audio_pts >= STREAM_DURATION) &&
            (!video_st || video_pts >= STREAM_DURATION))
            break;

        /* write interleaved audio and video frames */
        if (!video_st || (video_st && audio_st && audio

[PATCH 2/2] rtmp: Pass the proper return code inrtmp_handshake

Samuel Pitoiset — 2012-05-24T11:48:42

---
 libavformat/rtmpproto.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 1f78d1c..9af4584 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
< at >< at > -639,15 +639,16 < at >< at > static int rtmp_handshake(URLContext *s, RTMPContext *rt)
         return ret;
     }
 
-    i = ffurl_read_complete(rt->stream, serverdata, RTMP_HANDSHAKE_PACKET_SIZE + 1);
-    if (i != RTMP_HANDSHAKE_PACKET_SIZE + 1) {
+    if ((ret = ffurl_read_complete(rt->stream, serverdata,
+                                   RTMP_HANDSHAKE_PACKET_SIZE + 1)) < 0) {
         av_log(s, AV_LOG_ERROR, "Cannot read RTMP handshake response\n");
-        return AVERROR(EIO);
+        return ret;
     }
-    i = ffurl_read_complete(rt->stream, clientdata, RTMP_HANDSHAKE_PACKET_SIZE);
-    if (i != RTMP_HANDSHAKE_PACKET_SIZE) {
+
+    if ((ret = ffurl_read_complete(rt->stream, clientdata,
+                                   RTMP_HANDSHAKE_PACKET_SIZE)) < 0)

[PATCH] rtmp: Check return codes of net IO operations

Samuel Pitoiset — 2012-05-23T21:33:10

---
 libavformat/rtmppkt.c   |   14 ++++++---
 libavformat/rtmpproto.c |   75 +++++++++++++++++++++++++++++++++++------------
 2 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 474f637..0b333bf 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
< at >< at > -151,7 +151,10 < at >< at > int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p,
         offset    += chunk_size;
         size      += chunk_size;
         if (data_size > 0) {
-            ffurl_read_complete(h, &t, 1); //marker
+            if (ffurl_read_complete(h, &t, 1) != 1) { // marker
+                ff_rtmp_packet_destroy(p);
+                return AVERROR(EIO);
+            }
             size++;
             if (t != (0xC0 + channel_id))
                 return -1;
< at >< at > -218,15 +221,18 < at >< at > int ff_rtmp_packet_write(URLContext *h, RTMPPacket *pkt,
     }
     prev_pkt[pkt->channel_id].extra      = pkt->extra;
 
-    ffurl_write(h, pkt_hdr, p-pkt_hdr);
+    if (ffurl_write(h, pkt_hdr, p

[PATCH] rtmp: WIP: check retcodes of net IO operations

Andrey Utkin — 2012-05-23T20:50:03

Samuel, while you're at enhancing rtmp proto, could you please add also checks on net connection IO operations? I planned to do it by myself, but as you are already preparing the patchset, it makes more sense to ask you for this.
The reason for this patch is case when RTMP server is shut down while we publish the stream onto it. Currently it just strikes the application with SIGPIPE. I have an environment for testing this issue.
Thanks in advance, Samuel.
---8<---
---
 libavformat/rtmppkt.c   |    9 +++-
 libavformat/rtmpproto.c |  103 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 61e159b..8e8ca26 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
< at >< at > -216,15 +216,18 < at >< at > int ff_rtmp_packet_write(URLContext *h, RTMPPacket *pkt,
     }
     prev_pkt[pkt->channel_id].extra      = pkt->extra;
 
-    ffurl_write(h, pkt_hdr, p-pkt_hdr);
+    if (ffurl_write(h, pkt_hdr, p-pkt_hdr) < 0)
+

[PATCH] movenc: Don't write the 'wave' atom or itschild 'enda' for lpcm audio.

Alex Converse — 2012-05-23T18:39:16

It's left over from stsd v0. QuickTime 7 no longer writes 'wave' or 'enda'
when 'lpcm' is the audio tag.
---
 libavformat/movenc.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 35c03dd..9a57d46 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
< at >< at > -403,8 +403,6 < at >< at > static int mov_write_wave_tag(AVIOContext *pb, MOVTrack *track)
         ffio_wfourcc(pb, "mp4a");
         avio_wb32(pb, 0);
         mov_write_esds_tag(pb, track);
-    } else if (mov_pcm_le_gt16(track->enc->codec_id)) {
-        mov_write_enda_tag(pb);
     } else if (track->enc->codec_id == CODEC_ID_AMR_NB) {
         mov_write_amr_tag(pb, track);
     } else if (track->enc->codec_id == CODEC_ID_AC3) {
< at >< at > -641,8 +639,7 < at >< at > static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track)
         track->enc->codec_id == CODEC_ID_AMR_NB ||
         track->enc->codec_id == CODEC_ID_ALAC ||
         track->enc->codec_id == CODEC_ID_ADPCM_MS ||
-        track->

[PATCH] flvdec: Make sure sample_rate is set to theupdated value

Martin Storsjö — 2012-05-23T13:32:32

The sample_rate variable is used for checks for audio format
changes at the end of the function.

This fixes cases where the sample rate was set from the codec
id by flv_set_audio_codec (as for nellymoser 8 kHz/16 kHz),
so the value set to last_sample_rate wasn't equal to sample_rate
at this point. This caused the demuxer otherwise reports a spurious
change to 5512 Hz and back to the correct one.

Updating channels in the same way is only done for consistency.
Currently, flv_set_audio_codec doesn't update that value.
---
 libavformat/flvdec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 7c4b792..b9d65a6 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
< at >< at > -571,8 +571,8 < at >< at > static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
         }
         if(!st->codec->codec_id){
             flv_set_audio_codec(s, st, st->codec, flags & FLV_AUDIO_CODECID_MASK);
-            flv->last_sample_rate = st->codec->sample_rate

[PATCH 1/2] adpcm: Fix crash with broken,non-stereo samples

Reinhard Tartler — 2012-05-23T12:24:14

From: Michael Niedermayer <michaelni-RbZlAiThDcE< at >public.gmane.org>

Fixes half of http://ffmpeg.org/trac/ffmpeg/ticket/794
Adresses CVE-2012-0852

Bug found by: Oana Stratulat
CC: libav-stable-LOOeJiBropLYtjvyW6yDsg< at >public.gmane.org

Signed-off-by: Michael Niedermayer <michaelni-RbZlAiThDcE< at >public.gmane.org>
Signed-off-by: Reinhard Tartler <siretart-t24Mxcv9r2eELgA04lAiVw< at >public.gmane.org>
(cherry picked from commit 608708009f69ba4cecebf05120c696167494c897)
---
 libavcodec/adpcm.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 8170e7f..dc63fcd 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
< at >< at > -926,6 +926,9 < at >< at > static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
         /* Each EA ADPCM frame has a 12-byte header followed by 30-byte pieces,
            each coding 28 stereo samples. */
 
+        if(avctx->channels != 2)
+            return AVERROR_INVALIDDATA;
+
         current_left_sample   = sign_extend(bytestream2_get_le16u(&

[PATCH] Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2

Dave Yeo — 2012-05-23T20:34:13

---
 libavformat/os_support.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 1088c6c..223203a 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
< at >< at > -45,6 +45,12 < at >< at > static inline int is_dos_path(const char *path)
     return 0;
 }

+#if defined(__OS2__)
+#define SHUT_RD 0
+#define SHUT_WR 1
+#define SHUT_RDWR 2
+#endif
+
 #if defined(_WIN32)
 #define SHUT_RD SD_RECEIVE
 #define SHUT_WR SD_SEND
--
1.7.2.3