diff options
| author | Peter Schlaile <peter@schlaile.de> | 2011-11-20 20:08:56 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2011-11-20 20:08:56 +0400 |
| commit | af66321f3b7c1b84fada90fa0ab6f6e0774f4163 (patch) | |
| tree | 1d5b065e3f913d3386a7268b8bc07e07ba5d2a56 /source/blender/imbuf/intern/IMB_anim.h | |
| parent | 778cd80eb8497c7c2e10385ea9274254ae9494cb (diff) | |
== Sequencer / FFMPEG ==
This fixed two issues:
* RAW DV-seeking has to be done using DTS. Sounds silly, but ffmpeg
tracks internal state in RAW DV format decoder and runs mad, if
we seek by byte. Don't know, why I haven't noticed that, when I
added it.
* real fix(tm) for #29295
problem was: we did AVFrame read ahead, and the pattern
read_frame -> decode -> read_frame -> do color conversion of first frame
works everywhere but RAW RGB-files which do some pointer shuffling
within ffmpeg to save a memcpy...
I removed read ahead completely, since it didn't work like originally
intented. Might come back later, but the original purpose (making
resyncing easier if we are completely lost in stream) it never
fullfilled.
Diffstat (limited to 'source/blender/imbuf/intern/IMB_anim.h')
| -rw-r--r-- | source/blender/imbuf/intern/IMB_anim.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 5a410a6a583..b627baf99bd 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -173,6 +173,7 @@ struct anim { AVCodecContext *pCodecCtx; AVCodec *pCodec; AVFrame *pFrame; + int pFrameComplete; AVFrame *pFrameRGB; AVFrame *pFrameDeinterlaced; struct SwsContext *img_convert_ctx; @@ -181,7 +182,6 @@ struct anim { struct ImBuf * last_frame; int64_t last_pts; int64_t next_pts; - int64_t next_undecoded_pts; AVPacket next_packet; #endif |