diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-16 23:33:42 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-16 23:33:42 +0000 |
| commit | 847f0e85e8b0c8135294258a9507fba03cc1cc30 (patch) | |
| tree | 0a74838023ea90c3bb53c7c4f737bab5dc84e427 /src/demuxers/demux_smjpeg.c | |
| parent | b88ff04361ced758928d2ad8b87cb8986d044a35 (diff) | |
| download | xine-lib-847f0e85e8b0c8135294258a9507fba03cc1cc30.tar.gz xine-lib-847f0e85e8b0c8135294258a9507fba03cc1cc30.tar.bz2 | |
New stream/meta info (safe) stuff.
BIG NOTE: use helpers to access to these informations (get/set/reset):
_x_{stream,meta}_info_{get,set,reset}()
are for internal use, don't use *_public() ones from inside the beast ;-)
Some wrongly names "xine_" fonction renaming.
CVS patchset: 5757
CVS date: 2003/11/16 23:33:42
Diffstat (limited to 'src/demuxers/demux_smjpeg.c')
| -rw-r--r-- | src/demuxers/demux_smjpeg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index dc2bb98f1..fea38c122 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -23,7 +23,7 @@ * For more information on the SMJPEG file format, visit: * http://www.lokigames.com/development/smjpeg.php3 * - * $Id: demux_smjpeg.c,v 1.45 2003/11/15 14:01:02 miguelfreitas Exp $ + * $Id: demux_smjpeg.c,v 1.46 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -312,18 +312,18 @@ static void demux_smjpeg_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->audio_channels) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->audio_channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->audio_sample_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->audio_bits); /* send start buffers */ |