mpegts: Always honor a registration descriptor if present and there is no other codec...

[ffmpeg] / libavformat / psxstr.c

diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index 988d1f095e3a0c09b8f364ce1c14f741a479b61d..6405c246bd70749658638db43100b21992b50444 100644 (file)
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -224,7 +224,9 @@ static int str_read_packet(AVFormatContext *s,
             //    st->codec->bit_rate = 0; //FIXME;
                 st->codec->block_align = 128;
 
-                avpriv_set_pts_info(st, 64, 128, st->codec->sample_rate);
+                avpriv_set_pts_info(st, 64, 18 * 224 / st->codec->channels,
+                                    st->codec->sample_rate);
+                st->start_time = 0;
             }
             pkt = ret_pkt;
             if (av_new_packet(pkt, 2304))
@@ -233,6 +235,7 @@ static int str_read_packet(AVFormatContext *s,
 
             pkt->stream_index =
                 str->channels[channel].audio_stream_index;
+            pkt->duration = 1;
             return 0;
         default:
             av_log(s, AV_LOG_WARNING, "Unknown sector type %02X\n", sector[0x12]);
@@ -265,4 +268,5 @@ AVInputFormat ff_str_demuxer = {
     .read_header    = str_read_header,
     .read_packet    = str_read_packet,
     .read_close     = str_read_close,
+    .flags          = AVFMT_NO_BYTE_SEEK,
 };