diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-02-08 22:52:35 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-08 22:52:35 +0000 |
| commit | 99683a307776a7638ccce236a4ce5aa3e914e77d (patch) | |
| tree | 0660e22b28db65af16a2f4679f0e7c64c5e67c3a /libavcodec/common.h | |
| parent | f02ab8148c622d5547ef81d1e0c1a357d05134bc (diff) | |
| download | ffmpeg-99683a307776a7638ccce236a4ce5aa3e914e77d.tar.gz | |
2 byte shorter userdata for mpeg4
in the past it was startcode,string,00,7F,startcode
now it is startcode,string,stratcode
both are mpeg4 compliant, as according to the standard the userdata lasts until the next 00 00 01 (startcode prefix) but some very primitive decoders which simply skip until the first 00 byte and then expect the next valid startcode might fail with the old variant, just a theory though (didnt test if quicktime can decode it now)
Originally committed as revision 2767 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/common.h')
| -rw-r--r-- | libavcodec/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h index 2167ebc2b2..729ba4615b 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -291,7 +291,7 @@ void init_put_bits(PutBitContext *s, uint8_t *buffer, int buffer_size); int put_bits_count(PutBitContext *s); void align_put_bits(PutBitContext *s); void flush_put_bits(PutBitContext *s); -void put_string(PutBitContext * pbc, char *s); +void put_string(PutBitContext * pbc, char *s, int put_zero); /* bit input */ @@ -1142,7 +1142,7 @@ uint64_t tstart= rdtsc();\ #define STOP_TIMER(id) \ tend= rdtsc();\ -if(tcount<2 || tend - tstart < 4*tsum/tcount){\ +if(tcount<2 || tend - tstart < 8*tsum/tcount){\ tsum+= tend - tstart;\ tcount++;\ }else\ |