diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-09 18:18:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-09 18:30:24 +0200 |
| commit | dac7b278026401a67795181c22f6eaaf72095074 (patch) | |
| tree | f724aebe0dde18e909f65c95636be38944859546 | |
| parent | 962654f25137ee8a8f75625ee8f5440db060fc9f (diff) | |
| parent | b14086ca38efa1a86cb0f0c6aa147b05f698877b (diff) | |
| download | ffmpeg-dac7b278026401a67795181c22f6eaaf72095074.tar.gz | |
Merge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b'
* commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b':
mkv: Correctly report the latest packet had been flushed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskaenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 2cd7e9fca7..3b525ad4d4 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1899,7 +1899,7 @@ static int mkv_write_flush_packet(AVFormatContext *s, AVPacket *pkt) mkv_flush_dynbuf(s); avio_flush(s->pb); } - return 0; + return 1; } return mkv_write_packet(s, pkt); } |