Originally committed as revision 13856 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -47,7 +47,6 @@ static void flush_packet(AVFormatContext *s) |
| 47 | 47 |
|
| 48 | 48 |
/* prepare next packet */ |
| 49 | 49 |
ffm->frame_offset = 0; /* no key frame */ |
| 50 |
- ffm->pts = 0; /* no pts */ |
|
| 51 | 50 |
ffm->packet_ptr = ffm->packet; |
| 52 | 51 |
ffm->first_packet = 0; |
| 53 | 52 |
} |
| ... | ... |
@@ -60,10 +59,10 @@ static void ffm_write_data(AVFormatContext *s, |
| 60 | 60 |
FFMContext *ffm = s->priv_data; |
| 61 | 61 |
int len; |
| 62 | 62 |
|
| 63 |
- if (header && ffm->frame_offset == 0) |
|
| 63 |
+ if (header && ffm->frame_offset == 0) {
|
|
| 64 | 64 |
ffm->frame_offset = ffm->packet_ptr - ffm->packet + FFM_HEADER_SIZE; |
| 65 |
- if (header && ffm->pts == 0) |
|
| 66 | 65 |
ffm->pts = pts; |
| 66 |
+ } |
|
| 67 | 67 |
|
| 68 | 68 |
/* write as many packets as needed */ |
| 69 | 69 |
while (size > 0) {
|
| ... | ... |
@@ -1,10 +1,10 @@ |
| 1 | 1 |
18c4ba0e8e7adb781216e38de61c2e39 ff-test_h.avi |
| 2 | 2 |
4f11d850f564af3359951b46ed1e571e ff-test_l.avi |
| 3 |
-59c7b9ea84ea3d0e9fed64340f06a3d8 ff-test.swf |
|
| 4 |
-7869c3c4173745faa19dbc70fb199bb9 ff-test_h.asf |
|
| 5 |
-7367fd8c4dc4253af98c66df318e5307 ff-test_l.asf |
|
| 6 |
-76180cc972bd4bd46bc9104c82c971d9 ff-test_h.rm |
|
| 7 |
-edc63f73e1cd02841e3120b03c8133d6 ff-test_l.rm |
|
| 8 |
-d41d8cd98f00b204e9800998ecf8427e ff-test.jpg |
|
| 9 |
-d41d8cd98f00b204e9800998ecf8427e ff-test_small.jpg |
|
| 10 |
-dad98a8937cdbf7e57cef745d5558970 ff-test.mjpg |
|
| 3 |
+d976848a9e4d5d8fc2659e4841cdece5 ff-test.swf |
|
| 4 |
+37ccf79cb3a50fda99173e5ba4b44d55 ff-test_h.asf |
|
| 5 |
+3e2bff2fda1fe2ed334e639aa6839f0c ff-test_l.asf |
|
| 6 |
+60550d751dfa5172d878f7dd670e3aa4 ff-test_h.rm |
|
| 7 |
+6218946abd1c4af92f05a8a6208b1e1c ff-test_l.rm |
|
| 8 |
+e0dc91430660c619e97b5c82e0f398fc ff-test.jpg |
|
| 9 |
+84b9702e34b9e21a84bb29519fc1e3cc ff-test_small.jpg |
|
| 10 |
+a22cc793b9f938cc05cd0c56ccf9423c ff-test.mjpg |
| ... | ... |
@@ -15,7 +15,7 @@ bdb7484c68db722f66ba1630cf79844c *./tests/data/b-libav.mpg |
| 15 | 15 |
d6fdeb9f7083cc827f9510c6c4517dc0 *./tests/data/b-libav.swf |
| 16 | 16 |
335771 ./tests/data/b-libav.swf |
| 17 | 17 |
./tests/data/b-libav.swf CRC=0xe14e8847 |
| 18 |
-bbdd9a4904eceb530b1a9ae02c48d76f *./tests/data/b-libav.ffm |
|
| 18 |
+bbdf0d67ad1035d59adc3c4cd245f3a9 *./tests/data/b-libav.ffm |
|
| 19 | 19 |
380928 ./tests/data/b-libav.ffm |
| 20 | 20 |
./tests/data/b-libav.ffm CRC=0x2b71a386 |
| 21 | 21 |
f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv |