Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add support for changing the channel by the C key
  ffplay: cycle through the streams of the current program, and not every stream
  ffplay: add null packet after attached pics packet
  ffplay: factor out putting null packet into the queue

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

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index aae369787fd7daf691ba5e348272460adfa88c61..cbba2d02d833fc10bf87d3c7611f6ac781851792 100644 (file)
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1140,6 +1140,12 @@ static void mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
     int32_t *src[3],  i0,  i1,  i2;
     float   *srcf[3], i0f, i1f, i2f;
 
+    for (i = 1; i < 3; i++)
+        if (tile->codsty[0].transform != tile->codsty[i].transform) {
+            av_log(s->avctx, AV_LOG_ERROR, "Transforms mismatch, MCT not supported\n");
+            return;
+        }
+
     for (i = 0; i < 3; i++)
         if (tile->codsty[0].transform == FF_DWT97)
             srcf[i] = tile->comp[i].f_data;

diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c
index fcfea1ef1551f8ce8fe0636655b2fdba54226c66..da753263d06e7c57c1b25a6ff92b81b6c99c764d 100644 (file)
--- a/libavformat/oggparseopus.c
+++ b/libavformat/oggparseopus.c
@@ -140,4 +140,5 @@ const struct ogg_codec ff_opus_codec = {
     .magicsize        = 8,
     .header           = opus_header,
     .packet           = opus_packet,
+    .nb_header        = 1,
 };