diff options
author | Juanjo <pulento@users.sourceforge.net> | 2002-04-07 21:44:29 +0000 |
---|---|---|
committer | Juanjo <pulento@users.sourceforge.net> | 2002-04-07 21:44:29 +0000 |
commit | 10bb7023a224adbcd2b97d5115db57bf13094906 (patch) | |
tree | 85921bed3e9756d92ba95b8bd3f74e9cea9d0866 /libavcodec/mpeg12.c | |
parent | 3bf43d42eda38abd5b75d004e1431d71aacfbe48 (diff) | |
download | ffmpeg-10bb7023a224adbcd2b97d5115db57bf13094906.tar.gz |
- Added force_pts to av_write_packet() to be able to force PTS, this helps
(and fix) stream copying. By now force_pts it's just honoured by the MPEG
muxer. ASF could honour this also, but it should be fixed to use Tickers
first.
- MPEG audio decoder exports it's frame size in bytes.
- Hope this fix the floating point exception found in ffserver.
Originally committed as revision 382 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index d983690119..fbe177ccfd 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1403,6 +1403,7 @@ static int mpeg_decode_slice(AVCodecContext *avctx, for(;;) { clear_blocks(s->block[0]); + emms_c(); ret = mpeg_decode_mb(s, s->block); dprintf("ret=%d\n", ret); if (ret < 0) |