summaryrefslogtreecommitdiff
path: root/libavcodec/h263dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-10-30 16:58:49 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-10-30 16:58:49 +0000
commit5f1948111a4920ff74e31b4284ab0200f7938539 (patch)
tree1fe454e88a052f6172e6b8746b76e5361e86679b /libavcodec/h263dec.c
parent2a2bbcb05fde486eef76d070f26eecddd4de0ace (diff)
pts fix and related fixes
Originally committed as revision 2452 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r--libavcodec/h263dec.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index f83ff54420..1448287af5 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -28,17 +28,6 @@
//#define DEBUG
//#define PRINT_FRAME_TIME
-#ifdef PRINT_FRAME_TIME
-static inline long long rdtsc()
-{
- long long l;
- asm volatile( "rdtsc\n\t"
- : "=A" (l)
- );
-// printf("%d\n", int(l/1000));
- return l;
-}
-#endif
int ff_h263_decode_init(AVCodecContext *avctx)
{
@@ -446,6 +435,12 @@ retry:
if (MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix
return -1;
}
+
+ //we need to set current_picture_ptr before reading the header, otherwise we cant store anyting im there
+ if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){
+ int i= ff_find_unused_picture(s, 0);
+ s->current_picture_ptr= &s->picture[i];
+ }
/* let's go :-) */
if (s->msmpeg4_version==5) {