Mercurial > mplayer.hg

comparison libmpdemux/demux_ogg.c @ 10658:c5e7b34bfc19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Theora-CVS update patch by Martin Drab <drab@kepler.fjfi.cvut.cz>
author alex
date Mon, 18 Aug 2003 13:13:41 +0000
parents 2cae82f2ab02
children bc1aad87439a
comparison
equal deleted inserted replaced
10657:5678a8ab7979 10658:c5e7b34bfc19
48 * This is duplicated in `vd_theora.c'; put this in a common header? 48 * This is duplicated in `vd_theora.c'; put this in a common header?
49 */ 49 */
50 #ifdef HAVE_OGGTHEORA 50 #ifdef HAVE_OGGTHEORA
51 typedef struct theora_struct_st { 51 typedef struct theora_struct_st {
52 theora_state st; 52 theora_state st;
53 theora_comment cc;
53 theora_info inf; 54 theora_info inf;
54 } theora_struct_t; 55 } theora_struct_t;
55 #endif 56 #endif
56 57
57 //// OggDS headers 58 //// OggDS headers
631 // check for Theora 632 // check for Theora
632 # ifdef HAVE_OGGTHEORA 633 # ifdef HAVE_OGGTHEORA
633 } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) { 634 } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
634 int errorCode = 0; 635 int errorCode = 0;
635 theora_info inf; 636 theora_info inf;
636 errorCode = theora_decode_header (&inf, &pack); 637 theora_comment cc;
638
639 theora_info_init (&inf);
640 theora_comment_init (&cc);
641
642 errorCode = theora_decode_header (&inf, &cc, &pack);
637 if (errorCode) 643 if (errorCode)
638 mp_msg(MSGT_DEMUX,MSGL_ERR,"Theora header parsing failed: %i \n", 644 mp_msg(MSGT_DEMUX,MSGL_ERR,"Theora header parsing failed: %i \n",
639 errorCode); 645 errorCode);
640 else 646 else
641 { 647 {