diff options
| author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-09 22:00:57 +0000 |
|---|---|---|
| committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-09 22:00:57 +0000 |
| commit | de03d58545ced64606947dccd877341a127a4a69 (patch) | |
| tree | 5369dbcc68c95c8b05b5df9df79294b465117f7c /libmpcodecs/vd_ffmpeg.c | |
| parent | 71c200b0cbd80c47f13296c7216e84378460ebf4 (diff) | |
| download | mpv-de03d58545ced64606947dccd877341a127a4a69.tar.bz2 mpv-de03d58545ced64606947dccd877341a127a4a69.tar.xz | |
change internal real video packetizing format to the more straight forward one
see [MPlayer-dev-eng] [PATCH] cleanup/uniformize real video packetizing
patch blessed by Roberto
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28503 b3059339-0415-0410-9bf9-f77b7e298cf2
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 dc9ce071d1..a3055ccc1a 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -755,28 +755,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*)(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, 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, |