diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 18:53:58 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 19:22:52 +0300 |
commit | 0fecf2642b9d909820683647c70031a954f5e58d (patch) | |
tree | 36ca02de9fa27a049829fb589517223d2d0ce5f5 /libavformat/amr.c | |
parent | e309fdc7018a1027d187ec27fb1d69a41a4ee167 (diff) | |
parent | f1f60f5252b0b448adcce0c1c52f3161ee69b9bf (diff) |
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/amr.c')
-rw-r--r-- | libavformat/amr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c index 9d6581dee5..0459632b10 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -50,14 +50,14 @@ static int amr_write_header(AVFormatContext *s) { return -1; } - put_flush_packet(pb); + avio_flush(pb); return 0; } static int amr_write_packet(AVFormatContext *s, AVPacket *pkt) { avio_write(s->pb, pkt->data, pkt->size); - put_flush_packet(s->pb); + avio_flush(s->pb); return 0; } #endif /* CONFIG_AMR_MUXER */ |