diff options
| -rw-r--r-- | libavformat/ffmenc.c | 7 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 1a38f9937f..5747e855a5 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -74,13 +74,8 @@ static void ffm_write_data(AVFormatContext *s, ffm->packet_ptr += len; buf += len; size -= len; - if (ffm->packet_ptr >= ffm->packet_end) { - /* special case : no pts in packet : we leave the current one */ - if (ffm->pts == 0) - ffm->pts = pts; - + if (ffm->packet_ptr >= ffm->packet_end) flush_packet(s); - } } } diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 5e4d0b46a1..d5f7fcab27 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -15,7 +15,7 @@ bdb7484c68db722f66ba1630cf79844c *./tests/data/b-libav.mpg d6fdeb9f7083cc827f9510c6c4517dc0 *./tests/data/b-libav.swf 335771 ./tests/data/b-libav.swf ./tests/data/b-libav.swf CRC=0xe14e8847 -102427263dc342610721d5754fac4d87 *./tests/data/b-libav.ffm +11eec620bdcd3ef1a053fdb964d1b855 *./tests/data/b-libav.ffm 380928 ./tests/data/b-libav.ffm ./tests/data/b-libav.ffm CRC=0x2b71a386 f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv |