lavf/utils.c: Order packets with identical PTS by stream index.

This allows for more reproducible results when using multi-threading.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/tests/ref/fate/psx-str b/tests/ref/fate/psx-str
index c0b990854f..3872e289e5 100644
--- a/tests/ref/fate/psx-str
+++ b/tests/ref/fate/psx-str
@@ -1,5 +1,5 @@
-1, 0, 8064, 0x02260037
 0, 0, 115200, 0x6b106a56
+1, 0, 8064, 0x02260037
 1, 4800, 8064, 0x4ee9f4e9
 0, 6000, 115200, 0x53c16930
 1, 9600, 8064, 0xf8fd82aa
@@ -7,8 +7,8 @@
 1, 14400, 8064, 0xc100792b
 0, 18000, 115200, 0xc3c18ba0
 1, 19200, 8064, 0xf11a5316
-1, 24000, 8064, 0x6937f8c0
 0, 24000, 115200, 0xe281b655
+1, 24000, 8064, 0x6937f8c0
 1, 28800, 8064, 0xed194e42
 0, 30000, 115200, 0x7b1e0536
 1, 33600, 8064, 0x619ce54b
@@ -16,8 +16,8 @@
 1, 38400, 8064, 0x544999ec
 0, 42000, 115200, 0xfc67bf8e
 1, 43200, 8064, 0x0ea877b4
-1, 48000, 8064, 0xb764d1c0
 0, 48000, 115200, 0xb463151c
+1, 48000, 8064, 0xb764d1c0
 1, 52800, 8064, 0x7a2fd211
 0, 54000, 115200, 0x6e686846
 1, 57600, 8064, 0xff69f6c5
@@ -25,8 +25,8 @@
 1, 62400, 8064, 0x26c11ec7
 0, 66000, 115200, 0x17b91efc
 1, 67200, 8064, 0xfb4ecc0c
-1, 72000, 8064, 0x111d799b
 0, 72000, 115200, 0xc051a49a
+1, 72000, 8064, 0x111d799b
 1, 76800, 8064, 0xc704dc91
 0, 78000, 115200, 0xc68c227b
 1, 81600, 8064, 0xa9f372fb
@@ -34,8 +34,8 @@
 1, 86400, 8064, 0xa3f0ad0f
 0, 90000, 115200, 0x09d56ecc
 1, 91200, 8064, 0x958719b9
-1, 96000, 8064, 0x9b011bf7
 0, 96000, 115200, 0xc20e3485
+1, 96000, 8064, 0x9b011bf7
 1, 100800, 8064, 0x466d96fb
 0, 102000, 115200, 0xf07e2c48
 1, 105600, 8064, 0x6ed4eb29
@@ -43,8 +43,8 @@
 1, 110400, 8064, 0x066966db
 0, 114000, 115200, 0xed65bacd
 1, 115200, 8064, 0xf60fe0bc
-1, 120000, 8064, 0x2c845167
 0, 120000, 115200, 0x51a23a3b
+1, 120000, 8064, 0x2c845167
 1, 124800, 8064, 0x7d63894f
 0, 126000, 115200, 0x559ddce1
 1, 129600, 8064, 0x0682ee36
@@ -52,8 +52,8 @@
 1, 134400, 8064, 0xcaeb7c70
 0, 138000, 115200, 0x11b2dece
 1, 139200, 8064, 0x93948697
-1, 144000, 8064, 0x5805f0d6
 0, 144000, 115200, 0x851b877c
+1, 144000, 8064, 0x5805f0d6
 1, 148800, 8064, 0xcfb641ff
 0, 150000, 115200, 0x5f9a7c99
 1, 153600, 8064, 0xe3499bb1
@@ -61,8 +61,8 @@
 1, 158400, 8064, 0x689fe483
 0, 162000, 115200, 0x950b0de8
 1, 163200, 8064, 0x1b8f2f2d
-1, 168000, 8064, 0x23852e71
 0, 168000, 115200, 0x6ec4c89a
+1, 168000, 8064, 0x23852e71
 1, 172800, 8064, 0x15e7b298
 0, 174000, 115200, 0xa9234812
 1, 177600, 8064, 0x5345a9a3
@@ -70,8 +70,8 @@
 1, 182400, 8064, 0x257b6ecf
 0, 186000, 115200, 0x2cc1a2aa
 1, 187200, 8064, 0xaf62836c
-1, 192000, 8064, 0xc3a401e3
 0, 192000, 115200, 0x5df53b71
+1, 192000, 8064, 0xc3a401e3
 1, 196800, 8064, 0x2b98fdf1
 0, 198000, 115200, 0xe1d0cb31
 1, 201600, 8064, 0x37168697
@@ -79,8 +79,8 @@
 1, 206400, 8064, 0x2d876c89
 0, 210000, 115200, 0x9342d739
 1, 211200, 8064, 0xc40a6ada
-1, 216000, 8064, 0xcca6b829
 0, 216000, 115200, 0x586bc658
+1, 216000, 8064, 0xcca6b829
 1, 220800, 8064, 0x6667550a
 0, 222000, 115200, 0x76902834
 1, 225600, 8064, 0x99c1b5cb
@@ -88,8 +88,8 @@
 1, 230400, 8064, 0xc05d3ed3
 0, 234000, 115200, 0xce8c95fb
 1, 235200, 8064, 0xdd641781
-1, 240000, 8064, 0xa65d49dc
 0, 240000, 115200, 0xdf0d3de6
+1, 240000, 8064, 0xa65d49dc
 1, 244800, 8064, 0x2a0d5df7
 0, 246000, 115200, 0x120db7ae
 1, 249600, 8064, 0xa6348438
@@ -97,8 +97,8 @@
 1, 254400, 8064, 0xf2e1412d
 0, 258000, 115200, 0x2498d3b6
 1, 259200, 8064, 0xc41c6a7a
-1, 264000, 8064, 0x147edc3d
 0, 264000, 115200, 0x99975ff8
+1, 264000, 8064, 0x147edc3d
 1, 268800, 8064, 0x17e3cfe7
 0, 270000, 115200, 0xbad65f9f
 1, 273600, 8064, 0x01fe3969
@@ -106,8 +106,8 @@
 1, 278400, 8064, 0xc437ac11
 0, 282000, 115200, 0x6f8a61a0
 1, 283200, 8064, 0xbbf747c1
-1, 288000, 8064, 0x2a4b88c0
 0, 288000, 115200, 0x80c96143
+1, 288000, 8064, 0x2a4b88c0
 1, 292800, 8064, 0xcd149c80
 0, 294000, 115200, 0x663c6198
 1, 297600, 8064, 0xcf339dfc
@@ -115,8 +115,8 @@
 1, 302400, 8064, 0xc81ff84b
 0, 306000, 115200, 0xfe186346
 1, 307200, 8064, 0x4d978100
-1, 312000, 8064, 0x6da6665b
 0, 312000, 115200, 0x844962f8
+1, 312000, 8064, 0x6da6665b
 1, 316800, 8064, 0x12fa354f
 0, 318000, 115200, 0x917c672f
 1, 321600, 8064, 0x6baedae6
@@ -124,8 +124,8 @@
 1, 326400, 8064, 0xddd77327
 0, 330000, 115200, 0xace06816
 1, 331200, 8064, 0x0a31c118
-1, 336000, 8064, 0x7652ee6e
 0, 336000, 115200, 0x4ef26aa2
+1, 336000, 8064, 0x7652ee6e
 1, 340800, 8064, 0x486a24cc
 0, 342000, 115200, 0xf2046bb3
 1, 345600, 8064, 0xf6cf01ee
@@ -133,8 +133,8 @@
 1, 350400, 8064, 0x2a19e830
 0, 354000, 115200, 0x8a17716d
 1, 355200, 8064, 0xde675a31
-1, 360000, 8064, 0xeefcc9af
 0, 360000, 115200, 0x36127568
+1, 360000, 8064, 0xeefcc9af
 1, 364800, 8064, 0xaec4c989
 0, 366000, 115200, 0x3e877b5c
 1, 369600, 8064, 0x16b73de9
@@ -142,8 +142,8 @@
 1, 374400, 8064, 0x188a582a
 0, 378000, 115200, 0x41bc8a39
 1, 379200, 8064, 0xc092e73d
-1, 384000, 8064, 0xf7ebca97
 0, 384000, 115200, 0x6f839446
+1, 384000, 8064, 0xf7ebca97
 1, 388800, 8064, 0x170ce07a
 0, 390000, 115200, 0xef74a005
 1, 393600, 8064, 0xa0705384
@@ -151,8 +151,8 @@
 1, 398400, 8064, 0xd0154a3c
 0, 402000, 115200, 0x4607cf99
 1, 403200, 8064, 0x57c73c6c
-1, 408000, 8064, 0x590c9ddb
 0, 408000, 115200, 0x4c18e8db
+1, 408000, 8064, 0x590c9ddb
 1, 412800, 8064, 0x2cbe552f
 0, 414000, 115200, 0x04d71efb
 1, 417600, 8064, 0x0d286932
@@ -160,8 +160,8 @@
 1, 422400, 8064, 0x5931cea3
 0, 426000, 115200, 0x4dd48d01
 1, 427200, 8064, 0xaf0fb80d
-1, 432000, 8064, 0x7fb61e9b
 0, 432000, 115200, 0x5fa9627f
+1, 432000, 8064, 0x7fb61e9b
 1, 436800, 8064, 0xf17134bb
 0, 438000, 115200, 0x7a413f88
 1, 441600, 8064, 0xd647859a
@@ -169,8 +169,8 @@
 1, 446400, 8064, 0x55a60921
 0, 450000, 115200, 0x3d720e05
 1, 451200, 8064, 0x3811fa58
-1, 456000, 8064, 0xaceeccea
 0, 456000, 115200, 0x49243fd8
+1, 456000, 8064, 0xaceeccea
 1, 460800, 8064, 0x5fcedf14
 0, 462000, 115200, 0x9834b697
 1, 465600, 8064, 0xd8c64abf
@@ -178,8 +178,8 @@
 1, 470400, 8064, 0x79495e8d
 0, 474000, 115200, 0x3eaf5504
 1, 475200, 8064, 0x4b7db039
-1, 480000, 8064, 0x7152f86d
 0, 480000, 115200, 0x057a3701
+1, 480000, 8064, 0x7152f86d
 1, 484800, 8064, 0xd92cfc1a
 0, 486000, 115200, 0x6e88f21a
 1, 489600, 8064, 0x75c540ef
@@ -187,8 +187,8 @@
 1, 494400, 8064, 0x9c03ef5e
 0, 498000, 115200, 0x92212d84
 1, 499200, 8064, 0x7b2911c8
-1, 504000, 8064, 0x69d9d553
 0, 504000, 115200, 0xf6b0a4ff
+1, 504000, 8064, 0x69d9d553
 1, 508800, 8064, 0xcb45d7c5
 0, 510000, 115200, 0xb49e9b4e
 1, 513600, 8064, 0x37ec8b0a
@@ -196,5 +196,5 @@
 1, 518400, 8064, 0xe4354221
 0, 522000, 115200, 0x65f3339a
 1, 523200, 8064, 0xc0d91cdb
-1, 528000, 8064, 0xea0be175
 0, 528000, 115200, 0x38e40a20
+1, 528000, 8064, 0xea0be175