diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 20:59:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 20:59:36 +0200 |
| commit | 84a6abd95420f6552c30b11ab5585fdb306269ba (patch) | |
| tree | b3c381308d192bd3d4210c6bafee61fce91f37f2 | |
| parent | 82b1516a85ad21b5455dcfef6fe49d1189565c33 (diff) | |
| parent | 1bf6cb85bebe639c836cdbb4498ea5bc252a7c21 (diff) | |
| download | ffmpeg-84a6abd95420f6552c30b11ab5585fdb306269ba.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h263dec.c | 4 | ||||
| -rw-r--r-- | libavformat/applehttp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 32105b40d3..9df6fbaf6b 100644 --- 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 80bf864859..d4026daae2 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++) { |