Mercurial > mplayer.hg
annotate libmpdemux/demux_lavf.c @ 16784:7a6e909c223e
minor typo
author | diego |
---|---|
date | Mon, 17 Oct 2005 08:50:04 +0000 |
parents | 044260623695 |
children | 60189cd9bbc8 |
rev | line source |
---|---|
12164 | 1 /* |
2 Copyright (C) 2004 Michael Niedermayer <michaelni@gmx.at> | |
3 | |
4 This program is free software; you can redistribute it and/or modify | |
5 it under the terms of the GNU General Public License as published by | |
6 the Free Software Foundation; either version 2 of the License, or | |
7 (at your option) any later version. | |
8 | |
9 This program is distributed in the hope that it will be useful, | |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 GNU General Public License for more details. | |
13 | |
14 You should have received a copy of the GNU General Public License | |
15 along with this program; if not, write to the Free Software | |
16 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
17 */ | |
18 | |
19 // #include <stdio.h> | |
20 #include <stdlib.h> | |
21 // #include <unistd.h> | |
22 | |
23 #include "config.h" | |
24 #include "mp_msg.h" | |
25 // #include "help_mp.h" | |
26 | |
27 #include "stream.h" | |
28 #include "demuxer.h" | |
29 #include "stheader.h" | |
30 | |
31 #ifdef USE_LIBAVFORMAT | |
32 | |
33 #include "avformat.h" | |
34 #include "avi.h" | |
35 | |
36 #define PROBE_BUF_SIZE 2048 | |
37 | |
38 typedef struct lavf_priv_t{ | |
39 AVInputFormat *avif; | |
40 AVFormatContext *avfc; | |
41 ByteIOContext pb; | |
42 int audio_streams; | |
43 int video_streams; | |
12168 | 44 int64_t last_pts; |
12164 | 45 }lavf_priv_t; |
46 | |
47 extern void print_wave_header(WAVEFORMATEX *h); | |
48 extern void print_video_header(BITMAPINFOHEADER *h); | |
49 | |
15011 | 50 int64_t ff_gcd(int64_t a, int64_t b); |
51 | |
12164 | 52 static int mp_open(URLContext *h, const char *filename, int flags){ |
53 return 0; | |
54 } | |
55 | |
56 static int mp_read(URLContext *h, unsigned char *buf, int size){ | |
57 stream_t *stream = (stream_t*)h->priv_data; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
58 int ret; |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
59 |
12164 | 60 if(stream_eof(stream)) //needed? |
61 return -1; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
62 ret=stream_read(stream, buf, size); |
12166 | 63 |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
64 mp_msg(MSGT_HEADER,MSGL_DBG2,"%d=mp_read(%p, %p, %d), eof:%d\n", ret, h, buf, size, stream->eof); |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
65 return ret; |
12164 | 66 } |
67 | |
68 static int mp_write(URLContext *h, unsigned char *buf, int size){ | |
69 return -1; | |
70 } | |
71 | |
72 static offset_t mp_seek(URLContext *h, offset_t pos, int whence){ | |
73 stream_t *stream = (stream_t*)h->priv_data; | |
12165
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
74 |
6ae21c78ed8d
libavformat really doesnt like it that the streams get stuck if the end is reached
michael
parents:
12164
diff
changeset
|
75 mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", h, (int)pos, whence); |
12164 | 76 if(whence == SEEK_CUR) |
77 pos +=stream_tell(stream); | |
78 else if(whence == SEEK_END) | |
79 pos += stream->end_pos; | |
80 else if(whence != SEEK_SET) | |
81 return -1; | |
82 | |
12167 | 83 if(pos<stream->end_pos && stream->eof) |
12166 | 84 stream_reset(stream); |
12164 | 85 if(stream_seek(stream, pos)==0) |
86 return -1; | |
12166 | 87 |
12164 | 88 return pos; |
89 } | |
90 | |
91 static int mp_close(URLContext *h){ | |
92 return 0; | |
93 } | |
94 | |
95 static URLProtocol mp_protocol = { | |
96 "mp", | |
97 mp_open, | |
98 mp_read, | |
99 mp_write, | |
100 mp_seek, | |
101 mp_close, | |
102 }; | |
103 | |
16175 | 104 static int lavf_check_file(demuxer_t *demuxer){ |
12164 | 105 AVProbeData avpd; |
106 uint8_t buf[PROBE_BUF_SIZE]; | |
107 lavf_priv_t *priv; | |
108 | |
109 if(!demuxer->priv) | |
110 demuxer->priv=calloc(sizeof(lavf_priv_t),1); | |
111 priv= demuxer->priv; | |
112 | |
113 av_register_all(); | |
114 | |
15819 | 115 if(stream_read(demuxer->stream, buf, PROBE_BUF_SIZE)!=PROBE_BUF_SIZE) |
116 return 0; | |
12164 | 117 avpd.filename= demuxer->stream->url; |
118 avpd.buf= buf; | |
119 avpd.buf_size= PROBE_BUF_SIZE; | |
120 | |
121 priv->avif= av_probe_input_format(&avpd, 1); | |
122 if(!priv->avif){ | |
123 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: no clue about this gibberish!\n"); | |
124 return 0; | |
125 }else | |
126 mp_msg(MSGT_HEADER,MSGL_V,"LAVF_check: %s\n", priv->avif->long_name); | |
127 | |
16175 | 128 return DEMUXER_TYPE_LAVF; |
12164 | 129 } |
130 | |
16175 | 131 static demuxer_t* demux_open_lavf(demuxer_t *demuxer){ |
12164 | 132 AVFormatContext *avfc; |
133 AVFormatParameters ap; | |
134 lavf_priv_t *priv= demuxer->priv; | |
15011 | 135 int i,g; |
12164 | 136 char mp_filename[256]="mp:"; |
137 | |
138 memset(&ap, 0, sizeof(AVFormatParameters)); | |
139 | |
140 stream_seek(demuxer->stream, 0); | |
141 | |
142 register_protocol(&mp_protocol); | |
143 | |
12463 | 144 if(demuxer->stream->url) |
145 strncpy(mp_filename + 3, demuxer->stream->url, sizeof(mp_filename)-3); | |
146 else | |
147 strncpy(mp_filename + 3, "foobar.dummy", sizeof(mp_filename)-3); | |
12164 | 148 |
149 url_fopen(&priv->pb, mp_filename, URL_RDONLY); | |
150 | |
151 ((URLContext*)(priv->pb.opaque))->priv_data= demuxer->stream; | |
152 | |
153 if(av_open_input_stream(&avfc, &priv->pb, mp_filename, priv->avif, &ap)<0){ | |
154 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n"); | |
16175 | 155 return NULL; |
12164 | 156 } |
157 | |
158 priv->avfc= avfc; | |
159 | |
160 if(av_find_stream_info(avfc) < 0){ | |
161 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_find_stream_info() failed\n"); | |
16175 | 162 return NULL; |
12164 | 163 } |
164 | |
12167 | 165 if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title ); |
166 if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author ); | |
167 if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright); | |
168 if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment ); | |
169 if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album ); | |
170 // if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year ); | |
171 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track ); | |
172 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre ); | |
12164 | 173 |
174 for(i=0; i<avfc->nb_streams; i++){ | |
175 AVStream *st= avfc->streams[i]; | |
16000 | 176 #if LIBAVFORMAT_BUILD >= 4629 |
177 AVCodecContext *codec= st->codec; | |
178 #else | |
12164 | 179 AVCodecContext *codec= &st->codec; |
16000 | 180 #endif |
12164 | 181 |
182 switch(codec->codec_type){ | |
183 case CODEC_TYPE_AUDIO:{ | |
184 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); | |
185 sh_audio_t* sh_audio=new_sh_audio(demuxer, i); | |
186 priv->audio_streams++; | |
187 if(!codec->codec_tag) | |
188 codec->codec_tag= codec_get_wav_tag(codec->codec_id); | |
189 wf->wFormatTag= codec->codec_tag; | |
190 wf->nChannels= codec->channels; | |
191 wf->nSamplesPerSec= codec->sample_rate; | |
192 wf->nAvgBytesPerSec= codec->bit_rate/8; | |
193 wf->nBlockAlign= codec->block_align; | |
194 wf->wBitsPerSample= codec->bits_per_sample; | |
195 wf->cbSize= codec->extradata_size; | |
196 if(codec->extradata_size){ | |
197 memcpy( | |
198 wf + 1, | |
199 codec->extradata, | |
200 codec->extradata_size); | |
201 } | |
202 sh_audio->wf= wf; | |
15011 | 203 sh_audio->audio.dwSampleSize= codec->block_align; |
204 if(codec->frame_size && codec->sample_rate){ | |
205 sh_audio->audio.dwScale=codec->frame_size; | |
206 sh_audio->audio.dwRate= codec->sample_rate; | |
207 }else{ | |
208 sh_audio->audio.dwScale= codec->block_align ? codec->block_align*8 : 8; | |
209 sh_audio->audio.dwRate = codec->bit_rate; | |
210 } | |
211 g= ff_gcd(sh_audio->audio.dwScale, sh_audio->audio.dwRate); | |
212 sh_audio->audio.dwScale /= g; | |
213 sh_audio->audio.dwRate /= g; | |
214 // printf("sca:%d rat:%d fs:%d sr:%d ba:%d\n", sh_audio->audio.dwScale, sh_audio->audio.dwRate, codec->frame_size, codec->sample_rate, codec->block_align); | |
12164 | 215 sh_audio->ds= demuxer->audio; |
216 sh_audio->format= codec->codec_tag; | |
217 sh_audio->channels= codec->channels; | |
218 sh_audio->samplerate= codec->sample_rate; | |
15007 | 219 sh_audio->i_bps= codec->bit_rate/8; |
16134
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
220 switch (codec->codec_id) { |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
221 case CODEC_ID_PCM_S8: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
222 case CODEC_ID_PCM_U8: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
223 sh_audio->samplesize = 1; |
16135 | 224 break; |
16134
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
225 case CODEC_ID_PCM_S16LE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
226 case CODEC_ID_PCM_S16BE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
227 case CODEC_ID_PCM_U16LE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
228 case CODEC_ID_PCM_U16BE: |
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
229 sh_audio->samplesize = 2; |
16135 | 230 break; |
231 case CODEC_ID_PCM_ALAW: | |
232 sh_audio->format = 0x6; | |
233 break; | |
234 case CODEC_ID_PCM_MULAW: | |
235 sh_audio->format = 0x7; | |
236 break; | |
16134
a1fd1a7eeb35
lavf demuxer with raw PCM fix (and a related hang)
reimar
parents:
16000
diff
changeset
|
237 } |
12164 | 238 if(verbose>=1) print_wave_header(sh_audio->wf); |
15004 | 239 if(demuxer->audio->id != i && demuxer->audio->id != -1) |
240 st->discard= AVDISCARD_ALL; | |
241 else{ | |
242 demuxer->audio->id = i; | |
243 demuxer->audio->sh= demuxer->a_streams[i]; | |
244 } | |
12164 | 245 break;} |
246 case CODEC_TYPE_VIDEO:{ | |
247 BITMAPINFOHEADER *bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); | |
248 sh_video_t* sh_video=new_sh_video(demuxer, i); | |
249 | |
250 priv->video_streams++; | |
251 if(!codec->codec_tag) | |
252 codec->codec_tag= codec_get_bmp_tag(codec->codec_id); | |
253 bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size; | |
254 bih->biWidth= codec->width; | |
255 bih->biHeight= codec->height; | |
256 bih->biBitCount= codec->bits_per_sample; | |
257 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount/8; | |
258 bih->biCompression= codec->codec_tag; | |
259 sh_video->bih= bih; | |
260 sh_video->disp_w= codec->width; | |
261 sh_video->disp_h= codec->height; | |
16718
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
262 if (st->time_base.den) { /* if container has time_base, use that */ |
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
263 sh_video->video.dwRate= st->time_base.den; |
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
264 sh_video->video.dwScale= st->time_base.num; |
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
265 } else { |
15308 | 266 #if LIBAVFORMAT_BUILD >= 4624 |
267 sh_video->video.dwRate= codec->time_base.den; | |
268 sh_video->video.dwScale= codec->time_base.num; | |
269 #else | |
12164 | 270 sh_video->video.dwRate= codec->frame_rate; |
271 sh_video->video.dwScale= codec->frame_rate_base; | |
15308 | 272 #endif |
16718
044260623695
makes demux_lavf (-demuxer 35) use the framerate specified in the container
gpoirier
parents:
16346
diff
changeset
|
273 } |
12164 | 274 sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; |
275 sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; | |
276 sh_video->format = bih->biCompression; | |
12167 | 277 sh_video->aspect= codec->width * codec->sample_aspect_ratio.num |
278 / (float)(codec->height * codec->sample_aspect_ratio.den); | |
15007 | 279 sh_video->i_bps= codec->bit_rate/8; |
12167 | 280 mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n", |
281 codec->width, codec->sample_aspect_ratio.num, | |
282 codec->height, codec->sample_aspect_ratio.den); | |
283 | |
12164 | 284 sh_video->ds= demuxer->video; |
285 if(codec->extradata_size) | |
286 memcpy(sh_video->bih + 1, codec->extradata, codec->extradata_size); | |
287 if(verbose>=1) print_video_header(sh_video->bih); | |
288 /* short biPlanes; | |
289 int biXPelsPerMeter; | |
290 int biYPelsPerMeter; | |
291 int biClrUsed; | |
292 int biClrImportant;*/ | |
15004 | 293 if(demuxer->video->id != i && demuxer->video->id != -1) |
294 st->discard= AVDISCARD_ALL; | |
295 else{ | |
296 demuxer->video->id = i; | |
297 demuxer->video->sh= demuxer->v_streams[i]; | |
298 } | |
12164 | 299 break;} |
15004 | 300 default: |
301 st->discard= AVDISCARD_ALL; | |
12164 | 302 } |
303 } | |
304 | |
305 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: %d audio and %d video streams found\n",priv->audio_streams,priv->video_streams); | |
13749 | 306 mp_msg(MSGT_HEADER,MSGL_V,"LAVF: build %d\n", LIBAVFORMAT_BUILD); |
12164 | 307 if(!priv->audio_streams) demuxer->audio->id=-2; // nosound |
308 // else if(best_audio > 0 && demuxer->audio->id == -1) demuxer->audio->id=best_audio; | |
309 if(!priv->video_streams){ | |
310 if(!priv->audio_streams){ | |
311 mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF: no audio or video headers found - broken file?\n"); | |
16175 | 312 return NULL; |
12164 | 313 } |
314 demuxer->video->id=-2; // audio-only | |
315 } //else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video; | |
316 | |
16175 | 317 return demuxer; |
12164 | 318 } |
319 | |
16175 | 320 static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ |
12164 | 321 lavf_priv_t *priv= demux->priv; |
322 AVPacket pkt; | |
323 demux_packet_t *dp; | |
324 demux_stream_t *ds; | |
325 int id; | |
326 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_lavf_fill_buffer()\n"); | |
327 | |
328 demux->filepos=stream_tell(demux->stream); | |
329 | |
330 if(stream_eof(demux->stream)){ | |
331 // demuxre->stream->eof=1; | |
332 return 0; | |
333 } | |
334 | |
335 if(av_read_frame(priv->avfc, &pkt) < 0) | |
336 return 0; | |
337 | |
338 id= pkt.stream_index; | |
339 | |
340 if(id==demux->audio->id){ | |
341 // audio | |
342 ds=demux->audio; | |
343 if(!ds->sh){ | |
344 ds->sh=demux->a_streams[id]; | |
345 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF audio ID = %d\n",ds->id); | |
346 } | |
347 } else if(id==demux->video->id){ | |
348 // video | |
349 ds=demux->video; | |
350 if(!ds->sh){ | |
351 ds->sh=demux->v_streams[id]; | |
352 mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected LAVF video ID = %d\n",ds->id); | |
353 } | |
14611 | 354 } else { |
355 av_free_packet(&pkt); | |
356 return 1; | |
357 } | |
12164 | 358 |
359 if(0/*pkt.destruct == av_destruct_packet*/){ | |
360 //ok kids, dont try this at home :) | |
361 dp=(demux_packet_t*)malloc(sizeof(demux_packet_t)); | |
362 dp->len=pkt.size; | |
363 dp->next=NULL; | |
364 dp->refcount=1; | |
365 dp->master=NULL; | |
366 dp->buffer=pkt.data; | |
367 pkt.destruct= NULL; | |
368 }else{ | |
369 dp=new_demux_packet(pkt.size); | |
370 memcpy(dp->buffer, pkt.data, pkt.size); | |
371 av_free_packet(&pkt); | |
372 } | |
373 | |
13747 | 374 if(pkt.pts != AV_NOPTS_VALUE){ |
15308 | 375 #if LIBAVFORMAT_BUILD >= 4624 |
376 dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); | |
377 priv->last_pts= dp->pts * AV_TIME_BASE; | |
378 #else | |
13747 | 379 priv->last_pts= pkt.pts; |
380 dp->pts=pkt.pts / (float)AV_TIME_BASE; | |
15308 | 381 #endif |
13747 | 382 } |
12164 | 383 dp->pos=demux->filepos; |
384 dp->flags= !!(pkt.flags&PKT_FLAG_KEY); | |
385 // append packet to DS stream: | |
386 ds_add_packet(ds,dp); | |
387 return 1; | |
388 } | |
389 | |
16175 | 390 static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, int flags){ |
12168 | 391 lavf_priv_t *priv = demuxer->priv; |
392 mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_seek_lavf(%p, %f, %d)\n", demuxer, rel_seek_secs, flags); | |
393 | |
13607 | 394 #if LIBAVFORMAT_BUILD < 4619 |
12168 | 395 av_seek_frame(priv->avfc, -1, priv->last_pts + rel_seek_secs*AV_TIME_BASE); |
13607 | 396 #else |
397 av_seek_frame(priv->avfc, -1, priv->last_pts + rel_seek_secs*AV_TIME_BASE, rel_seek_secs < 0 ? AVSEEK_FLAG_BACKWARD : 0); | |
398 #endif | |
12164 | 399 } |
400 | |
16175 | 401 static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg) |
12164 | 402 { |
403 lavf_priv_t *priv = demuxer->priv; | |
404 | |
405 switch (cmd) { | |
12168 | 406 case DEMUXER_CTRL_GET_TIME_LENGTH: |
407 if (priv->avfc->duration == 0) | |
12164 | 408 return DEMUXER_CTRL_DONTKNOW; |
409 | |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16175
diff
changeset
|
410 *((double *)arg) = (double)priv->avfc->duration / AV_TIME_BASE; |
12164 | 411 return DEMUXER_CTRL_OK; |
412 | |
413 case DEMUXER_CTRL_GET_PERCENT_POS: | |
12168 | 414 if (priv->avfc->duration == 0) |
12164 | 415 return DEMUXER_CTRL_DONTKNOW; |
416 | |
12168 | 417 *((int *)arg) = (int)(priv->last_pts*100 / priv->avfc->duration); |
418 return DEMUXER_CTRL_OK; | |
12164 | 419 |
420 default: | |
421 return DEMUXER_CTRL_NOTIMPL; | |
422 } | |
423 } | |
424 | |
16175 | 425 static void demux_close_lavf(demuxer_t *demuxer) |
12164 | 426 { |
427 lavf_priv_t* priv = demuxer->priv; | |
428 if (priv){ | |
12304
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
429 if(priv->avfc) |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
430 { |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
431 av_close_input_file(priv->avfc); priv->avfc= NULL; |
434242b0706c
fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
michael
parents:
12168
diff
changeset
|
432 } |
12164 | 433 free(priv); demuxer->priv= NULL; |
434 } | |
435 } | |
436 | |
16175 | 437 |
438 demuxer_desc_t demuxer_desc_lavf = { | |
439 "libavformat demuxer", | |
440 "lavf", | |
441 "libavformat", | |
442 "Michael Niedermayer", | |
443 "supports many formats, requires libavformat", | |
444 DEMUXER_TYPE_LAVF, | |
445 0, // Check after other demuxer | |
446 lavf_check_file, | |
447 demux_lavf_fill_buffer, | |
448 demux_open_lavf, | |
449 demux_close_lavf, | |
450 demux_seek_lavf, | |
451 demux_lavf_control | |
452 }; | |
453 | |
12164 | 454 #endif // USE_LIBAVFORMAT |