diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
| commit | 1e869638280f962fb80f372d152234f21246c2af (patch) | |
| tree | 64657f88e7902aa000f44f40be4f8e575f58c8de /libmpcodecs/vd_ffmpeg.c | |
| parent | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (diff) | |
| parent | 379b176f25905f273a368336c3f5f287eeea51a2 (diff) | |
| download | mpv-1e869638280f962fb80f372d152234f21246c2af.tar.bz2 mpv-1e869638280f962fb80f372d152234f21246c2af.tar.xz | |
Merge svn changes up to r28537
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 82839ec942..159136eac1 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -740,28 +740,6 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ avctx->hurry_up=(flags&3)?((flags&2)?2:1):0; - if(sh->ds->demuxer->type != DEMUXER_TYPE_LAVF && - sh->ds->demuxer->type != DEMUXER_TYPE_LAVF_PREFERRED) - if( sh->format == mmioFOURCC('R', 'V', '1', '0') - || sh->format == mmioFOURCC('R', 'V', '1', '3') - || sh->format == mmioFOURCC('R', 'V', '2', '0') - || sh->format == mmioFOURCC('R', 'V', '3', '0') - || sh->format == mmioFOURCC('R', 'V', '4', '0')) - { - dp_hdr_t *hdr= (dp_hdr_t*)data; - uint32_t *offsets = (uint32_t*)((char *)data + hdr->chunktab); - uint8_t *offstab = av_malloc((hdr->chunks+1) * 8); - uint8_t *buf = data; - int chunks = hdr->chunks; - int dlen = hdr->len; - - buf[0] = chunks; - memcpy(offstab, offsets, (chunks + 1) * 8); - memmove(buf + 1 + (chunks + 1) * 8, (char *)data + sizeof(dp_hdr_t), dlen); - memcpy(buf + 1, offstab, (chunks + 1) * 8); - av_free(offstab); - } - mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "vd_ffmpeg data: %04x, %04x, %04x, %04x\n", ((int *)data)[0], ((int *)data)[1], ((int *)data)[2], ((int *)data)[3]); ret = avcodec_decode_video(avctx, pic, |