diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-05-21 20:43:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-05-21 20:43:21 +0000 |
| commit | 9ee91c2f53dbc7cc61e65805d57e0a805b5752d7 (patch) | |
| tree | 8b9419fb7d80a440bacf3d2783b3599648ee1c3d /libavformat/swf.c | |
| parent | e8733cc4d9b866643009342ec6839795a059fe53 (diff) | |
| download | android_external_ffmpeg-9ee91c2f53dbc7cc61e65805d57e0a805b5752d7.tar.gz android_external_ffmpeg-9ee91c2f53dbc7cc61e65805d57e0a805b5752d7.tar.bz2 android_external_ffmpeg-9ee91c2f53dbc7cc61e65805d57e0a805b5752d7.zip | |
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/swf.c')
| -rw-r--r-- | libavformat/swf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/swf.c b/libavformat/swf.c index a4f199ef3b..3f5ddd1678 100644 --- a/libavformat/swf.c +++ b/libavformat/swf.c @@ -805,8 +805,6 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) frame_rate = get_le16(pb); get_le16(pb); /* frame count */ - av_set_pts_info(s, 24, 1, 1000); /* 24 bit pts in ms */ - /* The Flash Player converts 8.8 frame rates to milliseconds internally. Do the same to get a correct framerate */ @@ -837,6 +835,8 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) /* Check for FLV1 */ if ( get_byte(pb) == SWF_VIDEO_CODEC_FLV1 ) { vst = av_new_stream(s, 0); + av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */ + vst->codec.codec_type = CODEC_TYPE_VIDEO; vst->codec.codec_id = CODEC_ID_FLV1; if ( swf->samples_per_frame ) { @@ -857,6 +857,7 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap) get_le16(pb); } ast = av_new_stream(s, 1); + av_set_pts_info(ast, 24, 1, 1000); /* 24 bit pts in ms */ if (!ast) return -ENOMEM; |