From ad62507f325ae4e93690a581283eb54dcfd4fee0 Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Wed, 3 Aug 2011 17:31:11 -0700
Subject: [PATCH 1/2] h263dec: Fix asserts broken by the elimination of
 FF_COMMON_FRAME.

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

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 7f3411b779..cba0c5a208 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -705,8 +705,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) {

From 1bf6cb85bebe639c836cdbb4498ea5bc252a7c21 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Thu, 4 Aug 2011 01:06:58 +0200
Subject: [PATCH 2/2] applehttp: fix variant discard logic

The v->ctx is always not NULL now, check for streams presence to
mark the read_header state.

Fixes bug #25, possibly introduced by 603b8bc
---
 libavformat/applehttp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index 906511ed06..10f58afde5 100644
--- 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++) {