diff mbox series

[FFmpeg-devel,1/3] avformat/matroskadec: Don't discard the upper 32bits of TrackNumber

Message ID 20200326004144.26758-1-andreas.rheinhardt@gmail.com
State Accepted
Headers show
Series [FFmpeg-devel,1/3] avformat/matroskadec: Don't discard the upper 32bits of TrackNumber
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Andreas Rheinhardt March 26, 2020, 12:41 a.m. UTC
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
This has already been sent in [1]; I'm resending it because it fits
here.

[1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-December/254841.html

 libavformat/matroskadec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Anton Khirnov March 26, 2020, 2:12 p.m. UTC | #1
Quoting Andreas Rheinhardt (2020-03-26 01:41:42)
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
> This has already been sent in [1]; I'm resending it because it fits
> here.
> 
> [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-December/254841.html
> 
>  libavformat/matroskadec.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

Looks good
Andreas Rheinhardt March 26, 2020, 6:53 p.m. UTC | #2
Anton Khirnov:
> Quoting Andreas Rheinhardt (2020-03-26 01:41:42)
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
>> ---
>> This has already been sent in [1]; I'm resending it because it fits
>> here.
>>
>> [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-December/254841.html
>>
>>  libavformat/matroskadec.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
> 
> Looks good
> 
Applied, thanks.

- Andreas
diff mbox series

Patch

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 4d7fdab99f..6425973954 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1545,7 +1545,7 @@  static int matroska_probe(const AVProbeData *p)
 }
 
 static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska,
-                                                 int num)
+                                                 uint64_t num)
 {
     MatroskaTrack *tracks = matroska->tracks.elem;
     int i;
@@ -1554,7 +1554,7 @@  static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska,
         if (tracks[i].num == num)
             return &tracks[i];
 
-    av_log(matroska->ctx, AV_LOG_ERROR, "Invalid track number %d\n", num);
+    av_log(matroska->ctx, AV_LOG_ERROR, "Invalid track number %"PRIu64"\n", num);
     return NULL;
 }