diff options
author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-11-15 14:54:30 +0000 |
---|---|---|
committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-11-15 14:54:30 +0000 |
commit | 1ace1c3f18fb48bab32a2ee5b69ae6e3bce12850 (patch) | |
tree | 21c51a97dcc8659809d2c8df9f5ce363bddadb2d /src/libffmpeg/xine_decoder.c | |
parent | 443d766f9506dfcc19de9c8fc224a61a0922f722 (diff) | |
download | xine-lib-1ace1c3f18fb48bab32a2ee5b69ae6e3bce12850.tar.gz xine-lib-1ace1c3f18fb48bab32a2ee5b69ae6e3bce12850.tar.bz2 |
start xine_stream_t separation (public/private).
(we should finish this before rc3.)
- stream_info and meta_info variables are private now.
obs: everything must be recompiled due xine_stream_t changes
CVS patchset: 5733
CVS date: 2003/11/15 14:54:30
Diffstat (limited to 'src/libffmpeg/xine_decoder.c')
-rw-r--r-- | src/libffmpeg/xine_decoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index 3c10c143c..4c2918e63 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.134 2003/11/15 13:01:12 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.135 2003/11/15 14:54:30 miguelfreitas Exp $ * * xine decoder plugin using ffmpeg * @@ -1487,7 +1487,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) this->context->block_align = audio_header->nBlockAlign; this->context->bit_rate = audio_header->nAvgBytesPerSec * 8; this->context->codec_id = this->codec->id; - this->context->codec_tag = this->stream->stream_info[XINE_STREAM_INFO_AUDIO_FOURCC]; + this->context->codec_tag = xine_get_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC); if( audio_header->cbSize > 0 ) { this->context->extradata = malloc(audio_header->cbSize); this->context->extradata_size = audio_header->cbSize; @@ -1504,7 +1504,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (avcodec_open (this->context, this->codec) < 0) { printf ("ffmpeg: couldn't open decoder\n"); - this->stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 0; + xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_HANDLED, 0); return; } |