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