comparison libmpdemux/demux_lavf.c @ 30905:6ca66cec8a15

Reindent
author reimar
date Mon, 22 Mar 2010 19:39:43 +0000
parents c449f1667e78
children ae2e8f0d4625
comparison
equal deleted inserted replaced
30904:c449f1667e78 30905:6ca66cec8a15
157 } 157 }
158 158
159 avpd.buf = av_mallocz(FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE) + 159 avpd.buf = av_mallocz(FFMAX(BIO_BUFFER_SIZE, PROBE_BUF_SIZE) +
160 FF_INPUT_BUFFER_PADDING_SIZE); 160 FF_INPUT_BUFFER_PADDING_SIZE);
161 do { 161 do {
162 read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size); 162 read_size = stream_read(demuxer->stream, avpd.buf + probe_data_size, read_size);
163 if(read_size < 0) { 163 if(read_size < 0) {
164 av_free(avpd.buf); 164 av_free(avpd.buf);
165 return 0; 165 return 0;
166 } 166 }
167 probe_data_size += read_size; 167 probe_data_size += read_size;
168 avpd.filename= demuxer->stream->url; 168 avpd.filename= demuxer->stream->url;
169 if (!strncmp(avpd.filename, "ffmpeg://", 9)) 169 if (!strncmp(avpd.filename, "ffmpeg://", 9))
170 avpd.filename += 9; 170 avpd.filename += 9;
171 avpd.buf_size= probe_data_size; 171 avpd.buf_size= probe_data_size;
172 172
173 priv->avif= av_probe_input_format(&avpd, probe_data_size > 0); 173 priv->avif= av_probe_input_format(&avpd, probe_data_size > 0);
174 read_size = FFMIN(2*read_size, PROBE_BUF_SIZE - probe_data_size); 174 read_size = FFMIN(2*read_size, PROBE_BUF_SIZE - probe_data_size);
175 } while ((demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED || 175 } while ((demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED ||
176 probe_data_size < SMALL_MAX_PROBE_SIZE) && 176 probe_data_size < SMALL_MAX_PROBE_SIZE) &&
177 !priv->avif && read_size > 0 && probe_data_size < PROBE_BUF_SIZE); 177 !priv->avif && read_size > 0 && probe_data_size < PROBE_BUF_SIZE);
178 av_free(avpd.buf); 178 av_free(avpd.buf);
179 179