- 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

2 files changed, 2 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)
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index bb86bd0ca4..b423788ca8 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2314,6 +2314,7 @@ static int decode_frame(AVCodecContext * avctx,
                         avctx->sample_rate = s->sample_rate;
                         avctx->channels = s->nb_channels;
 			avctx->bit_rate = s->bit_rate;
+			avctx->frame_size = s->frame_size;
                     }
 		}
 	    }