[FFmpeg-devel] [PATCH 3/4] avformat/psxstr: fix unknown sector type 00/80

[Michael Niedermayer]

On Tue, Jan 02, 2024 at 02:57:18AM +0000, aybe aybe wrote:
> This third patch fixes warnings that are false positives (still on STRv1).
> 
> That's because these sectors are simply empty ones as can be read in "System Description CD-ROM XA, May 1991,
> 4.3.2.3".
> 
> Haven't attempted significant refactoring as it just works, left a comment instead about the situation.
> 
> The result is that there are no more false warnings when converting.
> 
> Signed-off-by: aybe <aybe at users.noreply.github.com>
> ---
>   libavformat/psxstr.c | 7 +++++++
>   1 file changed, 7 insertions(+)
> 
> diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
> index 72d14b9792..306a690f52 100644
> --- a/libavformat/psxstr.c
> +++ b/libavformat/psxstr.c
> @@ -48,6 +48,7 @@
>   #define CDXA_TYPE_DATA     0x08
>   #define CDXA_TYPE_AUDIO    0x04
>   #define CDXA_TYPE_VIDEO    0x02
> +#define CDXA_TYPE_EMPTY    0x00
> 
>   #define STR_MAGIC (0x80010160)
> 
> @@ -274,6 +275,12 @@ static int str_read_packet(AVFormatContext *s,
>                   str->channels[channel].audio_stream_index;
>               pkt->duration = 1;
>               return 0;
> +        case CDXA_TYPE_EMPTY: /* CD-ROM XA, May 1991, 4.3.2.3 */
> +            {
> +                /* NOTE this also catches 0x80 (EOF bit) because of CDXA_TYPE_MASK */
> +                /* TODO consider refactoring so as to explicitly handle each case? */
> +                break;
> +            }

will apply without unneeded {}

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20240111/52f2a3e3/attachment.sig>