gmane.comp.video.ffmpeg.cvs

j2kdec: cosmetics from jpeg2000dec

Michael Niedermayer — 2013-05-21T23:34:57

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Wed May 22 01:25:52 2013 +0200| [8d9fa738f5cdad19add6e49b11e9521e96634a4b] | committer: Michael Niedermayer

j2kdec: cosmetics from jpeg2000dec

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/j2kdec.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index bb1aa9b..893fcd0 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
< at >< at > -211,9 +211,9 < at >< at > static int get_siz(Jpeg2000DecoderContext *s)
     if (bytestream2_get_bytes_left(&s->g) < 36)
         return AVERROR(EINVAL);
 
-                        bytestream2_get_be16u(&s->g); // Rsiz (skipped)
-             s->width = bytestream2_get_be32u(&s->g); // width
-            s->height = bytestream2_get_be32u(&s->g); // height
+                        bytestream2_get_be16u(&s->g); // Rsiz
+             s->width = bytestream2_get_be32u(&s->g); // Width
+            s->height = bytestream2_get_be32u(&

avcodec/jpeg2000dec: merge bytestream2 reading fromj2kdec

Michael Niedermayer — 2013-05-21T23:34:57

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Wed May 22 01:23:56 2013 +0200| [0b42631641d998e509cde6fa344edc6ab5cb4ac8] | committer: Michael Niedermayer

avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec

This fixes at least one out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/jpeg2000dec.c |  206 ++++++++++++++++++++++------------------------
 1 file changed, 99 insertions(+), 107 deletions(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 6fbbfb2..cf7a4c8 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
< at >< at > -44,8 +44,7 < at >< at > typedef struct Jpeg2000TilePart {
     uint16_t tp_idx;                    // Tile-part index
     uint8_t tile_index;                 // Tile index who refers the tile-part
     uint32_t tp_len;                    // Length of tile-part
-    const uint8_t *tp_start_bstrm;      // Start address bit stream in tile-part

avcodec/jpeg2000dec: get_qcx,fix stack and heap overwrites

Michael Niedermayer — 2013-05-21T22:11:22

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 23:38:26 2013 +0200| [c649ecb3b2321a8f48b6a6bca06e0156c8b38fc7] | committer: Michael Niedermayer

avcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites

This is likely remotely exploitable
Fix ported from j2kdec
No uptodate FFmpeg release should be affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/jpeg2000dec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 60489be..6fbbfb2 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
< at >< at > -353,7 +353,7 < at >< at > static int get_qcx(Jpeg2000DecoderContext *s, int n, Jpeg2000QuantStyle *q)
 
     if (q->quantsty == JPEG2000_QSTY_NONE) {
         n -= 3;
-        if (s->buf_end - s->buf < n)
+        if (s->buf_end - s->buf < n || 32*3 < n)
             return AVERROR(EINVAL);
         for (i = 0; i < n

lavu/opt: check if class is NULL too

Paul B Mahol — 2013-05-21T20:51:06

ffmpeg | branch: master | Paul B Mahol <onemda< at >gmail.com> | Tue May 21 20:48:42 2013 +0000| [f98dbc7311a30a30802c71571ff5e3d049ea7556] | committer: Paul B Mahol

lavu/opt: check if class is NULL too

Signed-off-by: Paul B Mahol <onemda< at >gmail.com>

---

 libavutil/opt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 1f0d6d0..4d06039 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
< at >< at > -63,7 +63,7 < at >< at > const AVOption *av_next_option(void *obj, const AVOption *last)
 const AVOption *av_opt_next(void *obj, const AVOption *last)
 {
     AVClass *class = *(AVClass**)obj;
-    if (!last && class->option && class->option[0].name)
+    if (!last && class && class->option && class->option[0].name)
         return class->option;
     if (last && last[1].name)
         return ++last;

lavfi/(a)showinfo: use link frame counter insteadof local counter.

Clément Bœsch — 2013-05-21T20:32:12

ffmpeg | branch: master | Clément Bœsch <ubitux< at >gmail.com> | Tue May 21 22:27:07 2013 +0200| [39dc1bc90fa79ede19f5688a84d938f869924e51] | committer: Clément Bœsch

lavfi/(a)showinfo: use link frame counter instead of local counter.

---

 libavfilter/af_ashowinfo.c |   10 ++--------
 libavfilter/vf_showinfo.c  |   12 ++----------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index 7770c27..75aed80 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
< at >< at > -43,11 +43,6 < at >< at > typedef struct AShowInfoContext {
      * Scratch space for individual plane checksums for planar audio
      */
     uint32_t *plane_checksums;
-
-    /**
-     * Frame counter
-     */
-    uint64_t frame;
 } AShowInfoContext;
 
 static av_cold void uninit(AVFilterContext *ctx)
< at >< at > -86,10 +81,10 < at >< at > static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
                                  buf->channel_layout);
 
     av_log(ctx, AV_LOG_INFO,
-

avutil/pixfmt: add forgotten deprecated to YUVJ411

Michael Niedermayer — 2013-05-21T19:57:24

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 21:49:28 2013 +0200| [81bec0ace4223305831450a194e2c2be01ff2975] | committer: Michael Niedermayer

avutil/pixfmt: add forgotten deprecated to YUVJ411

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavutil/pixfmt.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index b063251..9a25c2c 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
< at >< at > -237,7 +237,7 < at >< at > enum AVPixelFormat {
     AV_PIX_FMT_GBRAP,       ///< planar GBRA 4:4:4:4 32bpp
     AV_PIX_FMT_GBRAP16BE,   ///< planar GBRA 4:4:4:4 64bpp, big-endian
     AV_PIX_FMT_GBRAP16LE,   ///< planar GBRA 4:4:4:4 64bpp, little-endian
-    AV_PIX_FMT_YUVJ411P,    ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    AV_PIX_FMT_YUVJ411P,    ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of PIX_FMT_YUV411P and setting

avcodec/j2k: rename J2K_ constants to JPEG2000_

Michael Niedermayer — 2013-05-21T19:46:08

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 21:27:56 2013 +0200| [78c7bff04ac5180b47e739edbe015ff6b11bf0b9] | committer: Michael Niedermayer

avcodec/j2k: rename J2K_ constants to JPEG2000_

This should simplify merging the 2 decoders

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/j2k.c    |   52 ++++++++++++-------------
 libavcodec/j2k.h    |  108 +++++++++++++++++++++++++--------------------------
 libavcodec/j2kdec.c |   58 +++++++++++++--------------
 libavcodec/j2kenc.c |   48 +++++++++++------------
 4 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c
index 1e23622..2e789a2 100644
--- a/libavcodec/j2k.c
+++ b/libavcodec/j2k.c
< at >< at > -109,16 +109,16 < at >< at > static int getnbctxno(int flag, int bandno, int vert_causal_ctx_csty_symbol)
 {
     int h, v, d;
 
-    h = ((flag & J2K_T1_SIG_E) ? 1:0)+
-        ((flag & J2K_T1_SIG_W) ? 1:0);
-    v = ((flag & J2K_T1_SIG_N) ? 1:0);
+    h = ((flag & JPEG2000_T1

jpeg2000dec: Check ncomponents and tile dimensions

Michael Niedermayer — 2013-05-21T19:46:08

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 21:36:32 2013 +0200| [069ede29811685ed7b2cf958471eee455aab2077] | committer: Michael Niedermayer

jpeg2000dec: Check ncomponents and tile dimensions

Fixes various problems

Code ported from j2kdec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/jpeg2000dec.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index f7e6b6e..60489be 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
< at >< at > -176,6 +176,13 < at >< at > static int get_siz(Jpeg2000DecoderContext *s)
     s->tile_offset_y  = bytestream_get_be32(&s->buf); // YT0Siz
     s->ncomponents    = bytestream_get_be16(&s->buf); // CSiz
 
+    if(s->ncomponents <= 0 || s->ncomponents > 4) {
+        av_log(s->avctx, AV_LOG_ERROR, "unsupported/invalid ncomponents: %d\n", s->ncomponents);
+        return AVERROR(EINVAL);
+    }
+    if(s->

j2k: Rename structs to be more similar tojpeg2000dec

Michael Niedermayer — 2013-05-21T19:46:08

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 21:19:05 2013 +0200| [0ab0ed2b860977a6bfa0a9033e61a8070aac74ff] | committer: Michael Niedermayer

j2k: Rename structs to be more similar to jpeg2000dec

This should simplify merging

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/j2k.c    |   46 +++++++--------
 libavcodec/j2k.h    |   52 ++++++++---------
 libavcodec/j2kdec.c |  154 ++++++++++++++++++++++++-------------------------
 libavcodec/j2kenc.c |  158 +++++++++++++++++++++++++--------------------------
 4 files changed, 205 insertions(+), 205 deletions(-)

diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c
index e3c0c13..1e23622 100644
--- a/libavcodec/j2k.c
+++ b/libavcodec/j2k.c
< at >< at > -64,12 +64,12 < at >< at > static int tag_tree_size(int w, int h)
     return res + 1;
 }
 
-J2kTgtNode *ff_j2k_tag_tree_init(int w, int h)
+Jpeg2000TgtNode *ff_j2k_tag_tree_init(int w, int h)
 {
     int pw = w, ph = h;
-    J2kTgtNode *res, *t, *t2;
+    Jpeg2000TgtNode *res, *t

j2kdec: s/decode_packets/jpeg2000_decode_packets/

Michael Niedermayer — 2013-05-21T19:46:07

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 21:14:00 2013 +0200| [376e89e280fd94fbb6cffabf6971825d5e2e248e] | committer: Michael Niedermayer

j2kdec: s/decode_packets/jpeg2000_decode_packets/

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/j2kdec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c
index 3e78b0b..18faa15 100644
--- a/libavcodec/j2kdec.c
+++ b/libavcodec/j2kdec.c
< at >< at > -588,7 +588,7 < at >< at > static int decode_packet(J2kDecoderContext *s, J2kCodingStyle *codsty, J2kResLev
     return 0;
 }
 
-static int decode_packets(J2kDecoderContext *s, J2kTile *tile)
+static int jpeg2000_decode_packets(J2kDecoderContext *s, J2kTile *tile)
 {
     int layno, reslevelno, compno, precno, ok_reslevel;
     s->bit_index = 8;
< at >< at > -942,7 +942,7 < at >< at > static int decode_codestream(J2kDecoderContext *s)
                 av_log(s->avctx, AV_LOG_ERROR, "tile initialization failed\n");
                 return

lavfi/geq: prefer symbolic constants

Stefano Sabatini — 2013-05-21T19:43:14

ffmpeg | branch: master | Stefano Sabatini <stefasab< at >gmail.com> | Sun May 19 23:32:02 2013 +0200| [a8d98377b168f40343e911de2b12b09d8729efa5] | committer: Stefano Sabatini

lavfi/geq: prefer symbolic constants

Hopefully enhance readability.

---

 libavfilter/vf_geq.c |   66 ++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index 2aed5d4..70bcdbe 100644
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.c
< at >< at > -42,24 +42,26 < at >< at > typedef struct {
     int is_rgb;
 } GEQContext;
 
+enum { Y = 0, U, V, A, G, B, R };
+
 #define OFFSET(x) offsetof(GEQContext, x)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
 
 static const AVOption geq_options[] = {
-    { "lum_expr",   "set luminance expression",   OFFSET(expr_str[0]), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX, FLAGS },
-    { "lum",        "set luminance expression",   OFFSET(expr_str[0]), AV_OPT_TYPE_STRING, {.str=NULL}, CHA

lavfi/geq: add aliases for RGB options

Stefano Sabatini — 2013-05-21T19:43:14

ffmpeg | branch: master | Stefano Sabatini <stefasab< at >gmail.com> | Sun May 19 23:24:21 2013 +0200| [2210003b7f5710e01ab3e000fc59723ca93882ff] | committer: Stefano Sabatini

lavfi/geq: add aliases for RGB options

---

 doc/filters.texi      |   23 ++++++++++++-----------
 libavfilter/version.h |    2 +-
 libavfilter/vf_geq.c  |    8 +++++++-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 301887d..2475e00 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
< at >< at > -4003,27 +4003,28 < at >< at > For more information see:
 The filter accepts the following options:
 
 < at >table < at >option
-< at >item lum_expr
+< at >item lum_expr, lum
 Set the luminance expression.
-< at >item cb_expr
+< at >item cb_expr, cb
 Set the chrominance blue expression.
-< at >item cr_expr
+< at >item cr_expr, cr
 Set the chrominance red expression.
-< at >item alpha_expr
+< at >item alpha_expr, a
 Set the alpha expression.
-< at >item r
+< at >item red_expr, r
 Set the red expression.
-< at >item g
+< at >item green_expr, g
 Set the green expression.
-< at >it

vp3: zero allocated tables

Paul B Mahol — 2013-05-21T17:54:28

ffmpeg | branch: master | Paul B Mahol <onemda< at >gmail.com> | Fri May 17 12:48:03 2013 +0000| [dbb49a653971131e011eaca332741e5299a0a375] | committer: Paul B Mahol

vp3: zero allocated tables

Signed-off-by: Paul B Mahol <onemda< at >gmail.com>

---

 libavcodec/vp3.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 5bf2fee..fe4e48b 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
< at >< at > -1632,16 +1632,16 < at >< at > static av_cold int allocate_tables(AVCodecContext *avctx)
     y_fragment_count = s->fragment_width[0] * s->fragment_height[0];
     c_fragment_count = s->fragment_width[1] * s->fragment_height[1];
 
-    s->superblock_coding = av_malloc(s->superblock_count);
-    s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment));
-    s->coded_fragment_list[0] = av_malloc(s->fragment_count * sizeof(int));
-    s->dct_tokens_base = av_malloc(64*s->fragment_count * sizeof(*s->dct_tokens_base));
-    s->motion_val[0] = av_malloc(y_f

seek-test: make duration user configurable

Michael Niedermayer — 2013-05-21T16:39:47

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Mon May 20 04:21:34 2013 +0200| [66f5790d7bc22a3cd1b3b266a8c22bd51c65a05c] | committer: Michael Niedermayer

seek-test: make duration user configurable

Previously this was hardcoded to 4 seconds

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavformat/seek-test.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/seek-test.c b/libavformat/seek-test.c
index 34ac4de..8b0611d 100644
--- a/libavformat/seek-test.c
+++ b/libavformat/seek-test.c
< at >< at > -64,6 +64,7 < at >< at > int main(int argc, char **argv)
     int64_t seekfirst = AV_NOPTS_VALUE;
     int firstback=0;
     int frame_count = 1;
+    int duration = 4;
 
     for(i=2; i<argc; i+=2){
         if       (!strcmp(argv[i], "-seekforw")){
< at >< at > -73,6 +74,8 < at >< at > int main(int argc, char **argv)
             firstback = 1;
         } else if(!strcmp(argv[i], "-frames")){
             frame_count = atoi(argv[i+1]);
+        } else if(!strcmp(argv[i], "-durati

lavfi/yadif: add timeline support.

Clément Bœsch — 2013-05-21T14:15:47

ffmpeg | branch: master | Clément Bœsch <ubitux< at >gmail.com> | Tue May 21 14:52:34 2013 +0200| [b8a9876a8b204d922bde6d2fbdc72670800bdd42] | committer: Clément Bœsch

lavfi/yadif: add timeline support.

---

 libavfilter/version.h  |    2 +-
 libavfilter/vf_yadif.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavfilter/version.h b/libavfilter/version.h
index 22d4589..f238a96 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
< at >< at > -31,7 +31,7 < at >< at >
 
 #define LIBAVFILTER_VERSION_MAJOR  3
 #define LIBAVFILTER_VERSION_MINOR  68
-#define LIBAVFILTER_VERSION_MICRO 101
+#define LIBAVFILTER_VERSION_MICRO 102
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index cc7c3e2..0a435c2 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
< at >< at > -280,7 +280,7 < at >< at > static int filter_frame(AVFilterLink *link, AVFra

avcodec/huffman: use named identifer for the bitsconstant

Michael Niedermayer — 2013-05-21T11:52:36

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 13:37:00 2013 +0200| [b9ea6a84143a2a8fb5d1ba891e7378924ec76b6b] | committer: Michael Niedermayer

avcodec/huffman: use named identifer for the bits constant

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/fraps.c   |    2 +-
 libavcodec/huffman.c |    2 +-
 libavcodec/huffman.h |    1 +
 libavcodec/vp6.c     |    4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 00a38c6..c53367c 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
< at >< at > -105,7 +105,7 < at >< at > static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
     init_get_bits(&gb, s->tmpbuf, size * 8);
     for (j = 0; j < h; j++) {
         for (i = 0; i < w*step; i += step) {
-            dst[i] = get_vlc2(&gb, vlc.table, 9, 3);
+            dst[i] = get_vlc2(&gb, vlc.table, FF_HUFFMAN_BITS, 3);
             /* lines are stored as deltas between previous lines

avcodec/huffman: increase bits constant

Michael Niedermayer — 2013-05-21T11:52:37

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 13:40:01 2013 +0200| [b1bbd715d8c42f4236f3bceac061f81da2c31a35] | committer: Michael Niedermayer

avcodec/huffman: increase bits constant

Fixes Ticket2593

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/huffman.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index a04753f..729c09e 100644
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
< at >< at > -37,7 +37,7 < at >< at > typedef struct Node {
 
 #define FF_HUFFMAN_FLAG_HNODE_FIRST 0x01
 #define FF_HUFFMAN_FLAG_ZERO_COUNT  0x02
-#define FF_HUFFMAN_BITS 9
+#define FF_HUFFMAN_BITS 10
 
 typedef int (*HuffCmp)(const void *va, const void *vb);
 int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,

avcodec/bitstream: print vlc length in error case.

Michael Niedermayer — 2013-05-21T11:52:36

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 13:24:40 2013 +0200| [1d7e6a6bde73a83dc8175c20598dbb4b9f53e637] | committer: Michael Niedermayer

avcodec/bitstream: print vlc length in error case.

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/bitstream.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 7e297b9..308620d 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
< at >< at > -306,7 +306,7 < at >< at > int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
         if (!(condition))\
             continue;\
         if (buf[j].bits > 3*nb_bits || buf[j].bits>32) {\
-            av_log(NULL, AV_LOG_ERROR, "Too long VLC in init_vlc\n");\
+            av_log(NULL, AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\
             av_free(buf);\
             return -1;\
         }\

add YUVJ411P

Michael Niedermayer — 2013-05-21T11:02:38

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Mon May 20 15:12:10 2013 +0200| [a90baa63c33fbba3d79f5c119fd4c7fad722d701] | committer: Michael Niedermayer

add YUVJ411P

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/utils.c                   |    1 +
 libavutil/pixdesc.c                  |   12 ++++++++++++
 libavutil/pixfmt.h                   |    1 +
 libswscale/utils.c                   |    4 ++++
 tests/ref/fate/filter-pixdesc        |    1 +
 tests/ref/fate/filter-pixfmts-copy   |    1 +
 tests/ref/fate/filter-pixfmts-field  |    1 +
 tests/ref/fate/filter-pixfmts-hflip  |    1 +
 tests/ref/fate/filter-pixfmts-il     |    1 +
 tests/ref/fate/filter-pixfmts-null   |    1 +
 tests/ref/fate/filter-pixfmts-pad    |    1 +
 tests/ref/fate/filter-pixfmts-scale  |    1 +
 tests/ref/fate/filter-pixfmts-swapuv |    1 +
 tests/ref/fate/filter-pixfmts-vflip  |    1 +
 14 files changed, 28 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c6442

mjpegdec: fix AV_PIX_FMT_YUVJ411P handling

Michael Niedermayer — 2013-05-21T11:02:38

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Mon Apr 22 22:11:45 2013 +0200| [b60a65ee2d5da38faf8a439a86096ea9776493b4] | committer: Michael Niedermayer

mjpegdec: fix AV_PIX_FMT_YUVJ411P handling

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>

---

 libavcodec/mjpegdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ea90f1d..ef8e1c6 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
< at >< at > -428,7 +428,7 < at >< at > int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
         s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
         break;
     case 0x41111100:
-        s->avctx->pix_fmt = AV_PIX_FMT_YUV411P;
+        s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV411P : AV_PIX_FMT_YUVJ411P;
         s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
         break;
     default:

Merge remote-tracking branch 'qatar/master'

Michael Niedermayer — 2013-05-21T10:07:59

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue May 21 12:01:54 2013 +0200| [1d8b1f0e51106c1a24cee565cd29ea469a1d83f8] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdec: simplify slice component offsets handling

Merged-by: Michael Niedermayer <michaelni< at >gmx.at>

---