diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-01-09 01:26:32 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-01-09 01:26:32 +0000 |
| commit | c0641405dec6fb244e7d3104035f64f6e535731c (patch) | |
| tree | ebde21ba846624ff2ed4e0682b0b31a6a4dd1c0d /src/libffmpeg | |
| parent | d1c62ab2512fa23f7bf510396bf5bce28e05b5f9 (diff) | |
| download | xine-lib-c0641405dec6fb244e7d3104035f64f6e535731c.tar.gz xine-lib-c0641405dec6fb244e7d3104035f64f6e535731c.tar.bz2 | |
- rework semantics of some buffer flags. check buffer.h for details.
- increase demux and decoder apis
- fix runtime changing of ogg/ogm audio channels
note: i hope i haven't broken any demux->decoder data exchange. please report any problems.
CVS patchset: 6014
CVS date: 2004/01/09 01:26:32
Diffstat (limited to 'src/libffmpeg')
| -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 1331b57a5..f920a9851 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.148 2004/01/03 14:50:13 tmmm Exp $ + * $Id: xine_decoder.c,v 1.149 2004/01/09 01:26:33 miguelfreitas Exp $ * * xine decoder plugin using ffmpeg * @@ -768,7 +768,7 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { return; } - if (buf->decoder_flags & BUF_FLAG_HEADER) { + if (buf->decoder_flags & BUF_FLAG_STDHEADER) { lprintf ("header\n"); @@ -1358,7 +1358,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) audio_buffer_t *audio_buffer; int bytes_to_send; - if (buf->decoder_flags & BUF_FLAG_HEADER) { + if (buf->decoder_flags & BUF_FLAG_STDHEADER) { int codec_type; xine_waveformatex *audio_header = (xine_waveformatex *)buf->content; |