diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-13 22:23:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-13 22:24:47 +0200 |
| commit | ca1dfea12771b585846fb86aa08c3d7f066a3cc4 (patch) | |
| tree | 6db034b36245b9fe51d9a41d41be1718a3be8b89 /libavcodec/h264_refs.c | |
| parent | 75af0e6a1601a4246d6409ca28dc80a3ba0e8d6e (diff) | |
| parent | 3304a1e69a8a050eb66d2304acd2d01354fa1aac (diff) | |
| download | ffmpeg-ca1dfea12771b585846fb86aa08c3d7f066a3cc4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: add dithering to yuv2yuvX_altivec_real
rv34: free+allocate buffer instead of reallocating it to preserve alignment
h264: add missing brackets.
swscale: use 15-bit intermediates for 9/10-bit scaling.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index f61ad5bfdd..3a59d5f477 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -516,9 +516,10 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ pic = find_short(h, frame_num, &j); if(!pic){ if(mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg] - || h->long_ref[mmco[i].long_arg]->frame_num != frame_num) - av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n"); - err = AVERROR_INVALIDDATA; + || h->long_ref[mmco[i].long_arg]->frame_num != frame_num) { + av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n"); + err = AVERROR_INVALIDDATA; + } continue; } } |