- 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

1 files changed, 4 insertions, 4 deletions

diff --git a/libav/jpeg.c b/libav/jpeg.c
index 531e79792c..94971d9f8f 100644
--- a/libav/jpeg.c
+++ b/libav/jpeg.c
@@ -32,8 +32,8 @@ static int mpjpeg_write_header(AVFormatContext *s)
     return 0;
 }
 
-static int mpjpeg_write_packet(AVFormatContext *s, 
-                               int stream_index, UINT8 *buf, int size)
+static int mpjpeg_write_packet(AVFormatContext *s, int stream_index, 
+                               UINT8 *buf, int size, int force_pts)
 {
     UINT8 buf1[256];
 
@@ -74,7 +74,7 @@ static int single_jpeg_write_header(AVFormatContext *s)
 }
 
 static int single_jpeg_write_packet(AVFormatContext *s, int stream_index,
-                            UINT8 *buf, int size)
+                            UINT8 *buf, int size, int force_pts)
 {
     put_buffer(&s->pb, buf, size);
     put_flush_packet(&s->pb);
@@ -120,7 +120,7 @@ static int jpeg_write_header(AVFormatContext *s1)
 }
 
 static int jpeg_write_packet(AVFormatContext *s1, int stream_index,
-                            UINT8 *buf, int size)
+                            UINT8 *buf, int size, int force_pts)
 {
     JpegContext *s = s1->priv_data;
     char filename[1024];