diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-01-16 16:39:17 +0000 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-01-16 16:39:17 +0000 |
commit | 0c5a43d648e1e1ce262d94c57e9cf16ab32f77c2 (patch) | |
tree | cabbc31a5a83e5988b6b310d64f3bc620fde02e8 | |
parent | 2bdaf78c524bfa48bc6039662cec04e1d8a3d342 (diff) | |
download | ffmpeg-0c5a43d648e1e1ce262d94c57e9cf16ab32f77c2.tar.gz |
Merge declaration and initialization of io_buffer_size
Originally committed as revision 16639 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavformat/aviobuf.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f3a62fe41e..93efd65d0b 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -784,12 +784,7 @@ static int url_open_dyn_buf_internal(ByteIOContext **s, int max_packet_size) { DynBuffer *d; int ret; - unsigned io_buffer_size; - - if (max_packet_size) - io_buffer_size = max_packet_size; - else - io_buffer_size = 1024; + unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024; if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size) return -1; |