Merge remote-tracking branch 'qatar/master'

* qatar/master:
  applehttp: fix variant discard logic
  h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

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

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 32105b4..9df6fba 100644 (file)
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -713,8 +713,8 @@ intrax8_decoded:
 
     MPV_frame_end(s);
 
-assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);
-assert(s->current_picture.pict_type == s->pict_type);
+    assert(s->current_picture.f.pict_type == s->current_picture_ptr->f.pict_type);
+    assert(s->current_picture.f.pict_type == s->pict_type);
     if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
         *pict= *(AVFrame*)s->current_picture_ptr;
     } else if (s->last_picture_ptr != NULL) {

diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index 80bf864..d4026da 100644 (file)
--- a/libavformat/applehttp.c
+++ b/libavformat/applehttp.c
@@ -412,7 +412,7 @@ reload:
     c->end_of_segment = 1;
     c->cur_seq_no = v->cur_seq_no;
 
-    if (v->ctx) {
+    if (v->ctx && v->ctx->nb_streams) {
         v->needed = 0;
         for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams;
              i++) {