diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libavformat/adtsenc.c | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libavformat/adtsenc.c')
| -rw-r--r-- | contrib/ffmpeg/libavformat/adtsenc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/contrib/ffmpeg/libavformat/adtsenc.c b/contrib/ffmpeg/libavformat/adtsenc.c index 1ef683838..1949fcf54 100644 --- a/contrib/ffmpeg/libavformat/adtsenc.c +++ b/contrib/ffmpeg/libavformat/adtsenc.c @@ -1,7 +1,7 @@ /* * ADTS muxer. * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@smartjog.com> - * Mans Rullgard <mru@inprovide.com> + * Mans Rullgard <mans@mansr.com> * * This file is part of FFmpeg. * @@ -84,20 +84,15 @@ static int adts_write_frame_header(AVFormatContext *s, int size) put_bits(&pb, 2, 0); /* number_of_raw_data_blocks_in_frame */ flush_put_bits(&pb); - put_buffer(&s->pb, buf, ADTS_HEADER_SIZE); + put_buffer(s->pb, buf, ADTS_HEADER_SIZE); return 0; } -static int adts_write_trailer(AVFormatContext *s) -{ - return 0; -} - static int adts_write_packet(AVFormatContext *s, AVPacket *pkt) { ADTSContext *adts = s->priv_data; - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; if (!pkt->size) return 0; @@ -119,5 +114,4 @@ AVOutputFormat adts_muxer = { CODEC_ID_NONE, adts_write_header, adts_write_packet, - adts_write_trailer, }; |