History

Fix -t option for formats which holds dts and no pts

Etienne Buira committed 15 years ago

Commit 39dbe9b1 parent 36204ed2 files · +1 −332Browse files

Unified · Split

2 files
  1. ffmpeg.c +1 −1
  2. tests/ref/fate/lmlm4-demux +0 −331
ffmpeg.c+1−1
@@ -2727,7 +2727,7 @@ static int transcode(AVFormatContext **output_files, · 2726 unmodified lines
27272727
27282728 /* finish if recording time exhausted */
27292729 if (recording_time != INT64_MAX &&
2730− (pkt.pts != AV_NOPTS_VALUE || pkt.dts != AV_NOPTS_VALUE ?
2730+ (pkt.pts != AV_NOPTS_VALUE ?
27312731 av_compare_ts(pkt.pts, ist->st->time_base, recording_time + start_time, (AVRational){1, 1000000})
27322732 :
27332733 av_compare_ts(ist->pts, AV_TIME_BASE_Q, recording_time + start_time, (AVRational){1, 1000000})
tests/ref/fate/lmlm4-demux+0−331
@@ -214,334 +214,3 @@ · 213 unmodified lines
214214 0, 267267, 1327, 0x7d15307c
215215 1, 267840, 768, 0x8d766d40
216216 0, 270270, 1225, 0x1b5d0f5f
217−0, 273273, 1173, 0x840efed5
218−0, 276276, 1215, 0xa8e0035e
219−0, 279279, 1295, 0x142918ca
220−0, 282282, 1144, 0xf50cef50
221−0, 285285, 1527, 0x7d13bd9d
222−0, 288288, 5609, 0x1ae1921d
223−0, 291291, 1303, 0xabdc264f
224−0, 294294, 1419, 0x878169bf
225−0, 297297, 972, 0x00c4a257
226−0, 300300, 1277, 0x87d520cf
227−0, 303303, 1014, 0x5946b4ee
228−0, 306306, 1177, 0x124e0e23
229−0, 309309, 1402, 0x8e6363cc
230−0, 312312, 1171, 0x9bdaeda2
231−0, 315315, 1389, 0x2db53b22
232−0, 318318, 1056, 0xd1c3de3e
233−0, 321321, 1320, 0x1ea142c7
234−0, 324324, 1250, 0x33612229
235−0, 327327, 1477, 0xb9648b48
236−0, 330330, 1522, 0x5352c318
237−0, 333333, 1391, 0x5e9157e0
238−0, 336336, 5545, 0x569e64c1
239−0, 339339, 1354, 0xdb39469e
240−0, 342342, 1302, 0x79912b5d
241−0, 345345, 1065, 0x4befcdd2
242−0, 348348, 1408, 0x7d2f65a2
243−0, 351351, 1727, 0x9cac0398
244−0, 354354, 1590, 0xa321b563
245−0, 357357, 1039, 0xfa35cabf
246−0, 360360, 1184, 0xb332fde7
247−0, 363363, 669, 0xb10e3783
248−0, 366366, 784, 0x57275e09
249−0, 369369, 1051, 0xe072cd33
250−0, 372372, 1119, 0x635ee9ee
251−0, 375375, 1147, 0x3916f981
252−0, 378378, 1086, 0x306ef895
253−0, 381381, 827, 0x213f7aef
254−0, 384384, 5525, 0x19157827
255−0, 387387, 1044, 0xb661abc5
256−0, 390390, 1143, 0x032e1109
257−0, 393393, 1460, 0x5a2f9503
258−0, 396396, 1178, 0xd038141f
259−0, 399399, 1004, 0x410ec3b2
260−0, 402402, 1089, 0xc89af8c9
261−0, 405405, 1367, 0x52085e0a
262−0, 408408, 1115, 0x8bb2ee7f
263−0, 411411, 1325, 0xc2e05647
264−0, 414414, 1295, 0x213951c9
265−0, 417417, 1054, 0xbb8bdaae
266−0, 420420, 1210, 0x431122bd
267−0, 423423, 1400, 0x47526fcc
268−0, 426426, 1188, 0x19770b07
269−0, 429429, 1301, 0x437161c8
270−0, 432432, 5281, 0xc0c92b55
271−0, 435435, 840, 0x67da7b2f
272−0, 438438, 1094, 0x3fd6d944
273−0, 441441, 832, 0x0eda74bc
274−0, 444444, 1096, 0x3300da7b
275−0, 447447, 1018, 0xa208c971
276−0, 450450, 1389, 0x1167724c
277−0, 453453, 1411, 0xe3be666b
278−0, 456456, 1294, 0xa8f35cc6
279−0, 459459, 1232, 0xfd0d20fd
280−0, 462462, 1252, 0xadd83a26
281−0, 465465, 844, 0xcbaf6a55
282−0, 468468, 979, 0x78d9b241
283−0, 471471, 1057, 0x6743e16c
284−0, 474474, 776, 0xfedd6615
285−0, 477477, 1158, 0xa39fee34
286−0, 480480, 5288, 0x5f26ee02
287−0, 483483, 1029, 0xa681bee8
288−0, 486486, 1106, 0xa68dea33
289−0, 489489, 844, 0x42fd83ec
290−0, 492492, 779, 0xb5006759
291−0, 495495, 951, 0xec13af4f
292−0, 498498, 1011, 0x90e5c86e
293−0, 501501, 892, 0x4db48ca4
294−0, 504504, 804, 0x59bf73a7
295−0, 507507, 1001, 0x10c2b3ff
296−0, 510510, 879, 0x65c57eaf
297−0, 513513, 1320, 0x80815836
298−0, 516516, 1448, 0xaf457b3b
299−0, 519519, 1168, 0x65b9f96a
300−0, 522522, 1002, 0x053fafb9
301−0, 525525, 1101, 0x2d30c3d5
302−0, 528528, 5314, 0x87cee383
303−0, 531531, 1305, 0xb19035db
304−0, 534534, 1240, 0xdc6a0a65
305−0, 537537, 1067, 0x9c88ba67
306−0, 540540, 823, 0x2f736a43
307−0, 543543, 1183, 0x2ef9f3c9
308−0, 546546, 899, 0x3fcc8d11
309−0, 549549, 886, 0xccec8d49
310−0, 552552, 1190, 0x2d020fa1
311−0, 555555, 1017, 0x0776b627
312−0, 558558, 1202, 0xbdd808d5
313−0, 561561, 998, 0x64c7c246
314−0, 564564, 1200, 0x9d6e2289
315−0, 567567, 895, 0xa8a68d80
316−0, 570570, 748, 0xe61a49fb
317−0, 573573, 929, 0x30168b50
318−0, 576576, 5276, 0xceb2edf2
319−0, 579579, 1127, 0xab43ddc3
320−0, 582582, 1028, 0xaacfbff5
321−0, 585585, 914, 0xb63c8fb0
322−0, 588588, 1067, 0xbdacd1ed
323−0, 591591, 1109, 0x6792ddec
324−0, 594594, 1310, 0x71bc4da2
325−0, 597597, 1098, 0xc464de9b
326−0, 600600, 1018, 0x6833b875
327−0, 603603, 1210, 0x44faf34b
328−0, 606606, 1200, 0x9ee816f6
329−0, 609609, 1461, 0xc76b7d2b
330−0, 612612, 829, 0x006677e6
331−0, 615615, 1145, 0xc769fb13
332−0, 618618, 1292, 0xb63225f5
333−0, 621621, 1252, 0x0e2a2626
334−0, 624624, 5257, 0x3877eca1
335−0, 627627, 952, 0x7f708d25
336−0, 630630, 1125, 0x140cd81b
337−0, 633633, 1095, 0x3025dade
338−0, 636636, 1388, 0xd7494d4e
339−0, 639639, 1124, 0x0c48ee92
340−0, 642642, 1556, 0xa0749ee2
341−0, 645645, 1461, 0xe5fd7d7f
342−0, 648648, 903, 0x07a58303
343−0, 651651, 1049, 0x4b6cd03b
344−0, 654654, 1044, 0x5f47cb48
345−0, 657657, 1253, 0xba281c6a
346−0, 660660, 1618, 0xed7cd040
347−0, 663663, 981, 0x2926b6f4
348−0, 666666, 1560, 0xa0e1ab73
349−0, 669669, 1479, 0x41a77e88
350−0, 672672, 5222, 0xc2dbd182
351−0, 675675, 925, 0x967580dd
352−0, 678678, 1284, 0x5b7822e0
353−0, 681681, 1512, 0xe84da1e0
354−0, 684684, 1514, 0xc38bb09e
355−0, 687687, 1224, 0x8752228e
356−0, 690690, 1296, 0xcf053c03
357−0, 693693, 1117, 0x9a81e659
358−0, 696696, 1090, 0x003ed687
359−0, 699699, 1196, 0x3a510937
360−0, 702702, 1075, 0x05eec8d4
361−0, 705705, 1048, 0x3b19cb96
362−0, 708708, 944, 0xaad89770
363−0, 711711, 960, 0x94649e4c
364−0, 714714, 1079, 0x530ddaba
365−0, 717717, 1150, 0x0339e696
366−0, 720720, 5189, 0xb8dac0bf
367−0, 723723, 1129, 0x3b2cd64d
368−0, 726726, 962, 0xe9df9a07
369−0, 729729, 1113, 0xc6ccddb2
370−0, 732732, 1069, 0xf589d4a4
371−0, 735735, 889, 0x5f7b8762
372−0, 738738, 863, 0xe9c36be4
373−0, 741741, 1021, 0xcfb5a737
374−0, 744744, 1048, 0x203ac9ff
375−0, 747747, 1223, 0x3e30fe35
376−0, 750750, 814, 0x59c076fc
377−0, 753753, 1157, 0x0dcf0bd0
378−0, 756756, 1691, 0xdd030547
379−0, 759759, 1700, 0x7641fb7e
380−0, 762762, 1791, 0x57ac147b
381−0, 765765, 2008, 0x3d4483ca
382−0, 768768, 4579, 0x874aa75b
383−0, 771771, 1647, 0xeddef621
384−0, 774774, 1999, 0x61d4a23a
385−0, 777777, 1572, 0x1c3ae6e1
386−0, 780780, 1803, 0xb31c3a11
387−0, 783783, 1919, 0xccbf64e3
388−0, 786786, 1720, 0xa4d010e5
389−0, 789789, 1721, 0x87ee0c7b
390−0, 792792, 1626, 0x8211f3d0
391−0, 795795, 1675, 0xef8a0b3d
392−0, 798798, 1609, 0x8731ce06
393−0, 801801, 1691, 0xcf24038b
394−0, 804804, 1637, 0x21d8e1b2
395−0, 807807, 1546, 0xc597a700
396−0, 810810, 1518, 0xb944bc11
397−0, 813813, 1403, 0x999e59a8
398−0, 816816, 2467, 0xe69f2507
399−0, 819819, 531, 0x3c7cea7e
400−0, 822822, 555, 0xdf20fb22
401−0, 825825, 500, 0xebeee00d
402−0, 828828, 446, 0x664cc711
403−0, 831831, 521, 0xf223df4b
404−0, 834834, 559, 0x4dc60028
405−0, 837837, 593, 0xec440ba9
406−0, 840840, 557, 0xef0100b1
407−0, 843843, 602, 0x7b1cfd88
408−0, 846846, 566, 0x77700a1d
409−0, 849849, 523, 0x3df7eb64
410−0, 852852, 482, 0x5da1dba9
411−0, 855855, 541, 0x9c8ff3d7
412−0, 858858, 572, 0x3e1204b2
413−0, 861861, 549, 0x0921fe3d
414−0, 864864, 2429, 0xba4fe5a8
415−0, 867867, 495, 0xc35ade54
416−0, 870870, 453, 0xcc66c9dc
417−0, 873873, 421, 0x3aa7ce8f
418−0, 876876, 448, 0x56c6d3d7
419−0, 879879, 478, 0x4131d467
420−0, 882882, 497, 0xac3ce3ca
421−0, 885885, 470, 0x41b9d9d3
422−0, 888888, 454, 0x44c2d956
423−0, 891891, 460, 0x6629db01
424−0, 894894, 488, 0x6be2dd68
425−0, 897897, 512, 0xda4cf116
426−0, 900900, 550, 0x6e990da9
427−0, 903903, 561, 0x81180e5e
428−0, 906906, 689, 0xe58a5a9a
429−0, 909909, 548, 0xfa1417a9
430−0, 912912, 2832, 0x942495a5
431−0, 915915, 610, 0x6b201ab9
432−0, 918918, 1015, 0x5f36b3f9
433−0, 921921, 870, 0x14e48f0c
434−0, 924924, 716, 0xf4034b52
435−0, 927927, 763, 0xcbf4694e
436−0, 930930, 778, 0xb9396764
437−0, 933933, 831, 0x31999005
438−0, 936936, 877, 0xc95e977f
439−0, 939939, 836, 0xb56c7d61
440−0, 942942, 853, 0x2d5980cf
441−0, 945945, 861, 0x25629295
442−0, 948948, 897, 0x0ff78a5f
443−0, 951951, 1016, 0x4dd8cdfd
444−0, 954954, 1117, 0x763f06c4
445−0, 957957, 984, 0xcf7bc906
446−0, 960960, 2750, 0xd428962d
447−0, 963963, 995, 0x5cbdd6a4
448−0, 966966, 894, 0xc42b9e25
449−0, 969969, 1028, 0xdf8ad906
450−0, 972972, 1059, 0x4c49f0cc
451−0, 975975, 1122, 0x8880eed8
452−0, 978978, 1007, 0xa9b4c243
453−0, 981981, 1055, 0x6051dcd6
454−0, 984984, 1293, 0xc3b32fa5
455−0, 987987, 1101, 0xf986f9af
456−0, 990990, 1272, 0x13883127
457−0, 993993, 1037, 0xb97cebff
458−0, 996996, 980, 0x0931d807
459−0, 999999, 928, 0xbc3eb30b
460−0, 1003002, 1068, 0x62d9e8de
461−0, 1006005, 852, 0x9278a49a
462−0, 1009008, 2841, 0x3091d12d
463−0, 1012011, 931, 0x60f6c26e
464−0, 1015014, 949, 0x31b9c856
465−0, 1018017, 835, 0xfe018775
466−0, 1021020, 779, 0x85356cd7
467−0, 1024023, 748, 0x862756bf
468−0, 1027026, 768, 0x0b7d645c
469−0, 1030029, 786, 0x7c196f5b
470−0, 1033032, 716, 0x4e8252cc
471−0, 1036035, 671, 0x0b2d3023
472−0, 1039038, 708, 0x3b2b4f25
473−0, 1042041, 786, 0x523d670e
474−0, 1045044, 680, 0x329142ec
475−0, 1048047, 703, 0x841b456c
476−0, 1051050, 660, 0x5cf332f1
477−0, 1054053, 681, 0xcd7b3915
478−0, 1057056, 2445, 0x27660ecb
479−0, 1060059, 667, 0xf3d53d2a
480−0, 1063062, 652, 0xe2b037b0
481−0, 1066065, 695, 0x200248fc
482−0, 1069068, 659, 0x7f6434c5
483−0, 1072071, 682, 0x8d243afb
484−0, 1075074, 701, 0x16e6476f
485−0, 1078077, 636, 0x319a3236
486−0, 1081080, 679, 0x81fa41f9
487−0, 1084083, 740, 0xb32850af
488−0, 1087086, 694, 0xe3f832c2
489−0, 1090089, 681, 0x8174353f
490−0, 1093092, 757, 0xebbe5a1f
491−0, 1096095, 683, 0x9b46383c
492−0, 1099098, 816, 0xd41e6bdf
493−0, 1102101, 1058, 0x6170d2e6
494−0, 1105104, 2489, 0x58fb28e1
495−0, 1108107, 804, 0xb3037da8
496−0, 1111110, 1053, 0x81ffc0a8
497−0, 1114113, 868, 0xf73583cb
498−0, 1117116, 875, 0xfa5d85bd
499−0, 1120119, 723, 0x0714418d
500−0, 1123122, 670, 0xd04333a1
501−0, 1126125, 854, 0x370e730d
502−0, 1129128, 794, 0x3d8a5e3c
503−0, 1132131, 836, 0xebe26aa7
504−0, 1135134, 871, 0x1da58c5e
505−0, 1138137, 827, 0xda1e6ccb
506−0, 1141140, 805, 0x10ad6a44
507−0, 1144143, 831, 0x826f6fc9
508−0, 1147146, 832, 0xb2517364
509−0, 1150149, 887, 0x11bf8a3f
510−0, 1153152, 2718, 0x26a8a174
511−0, 1156155, 805, 0x4d0179f9
512−0, 1159158, 699, 0x176c4f45
513−0, 1162161, 758, 0xc1fc5b16
514−0, 1165164, 707, 0x161b4891
515−0, 1168167, 733, 0x99b554c0
516−0, 1171170, 671, 0xccee2f89
517−0, 1174173, 762, 0xd6416c9d
518−0, 1177176, 721, 0x2ad94f0c
519−0, 1180179, 727, 0x6280572e
520−0, 1183182, 856, 0x0a7b797e
521−0, 1186185, 843, 0xc64288aa
522−0, 1189188, 877, 0x6d1c945d
523−0, 1192191, 780, 0x4ba464e8
524−0, 1195194, 808, 0xb3087cca
525−0, 1198197, 870, 0x75809930
526−0, 1201200, 2919, 0x5a80f685
527−0, 1204203, 1027, 0xc98add3d
528−0, 1207206, 1003, 0x0d88bd54
529−0, 1210209, 1189, 0xb2f91ec7
530−0, 1213212, 1320, 0x5acc4db3
531−0, 1216215, 1381, 0xbd585feb
532−0, 1219218, 1378, 0xe1a656f0
533−0, 1222221, 1398, 0x88b57a5e
534−0, 1225224, 1449, 0x1c737698
535−0, 1228227, 1420, 0x6f0f80cd
536−0, 1231230, 1032, 0x2d16d643
537−0, 1234233, 1275, 0x38844729
538−0, 1237236, 1112, 0x300207ea
539−0, 1240239, 1105, 0xa2b700be
540−0, 1243242, 1283, 0x08d04bef
541−0, 1246245, 1056, 0xf795d994
542−0, 1249248, 3202, 0xebf07050
543−0, 1252251, 1034, 0x1099dbe5
544−0, 1255254, 922, 0x88be9edc
545−0, 1258257, 1050, 0xd3d7eb96
546−0, 1261260, 979, 0x8de6b302
547−0, 1264263, 1053, 0x5de2eca8

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t