Commit b77afd5c authored by conrad's avatar conrad

oggz-merge, oggz-sort: use oggz_stream_get_content() instead of ot_page_identify()


git-svn-id: http://svn.annodex.net/liboggz/trunk@3800 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent b4dc262a
......@@ -233,12 +233,10 @@ oggz_merge (OMData * omdata, FILE * outfile)
min_i = i;
if (careful_for_theora || warn_all_vorbis) {
const char * codec_name;
int is_vorbis = 0;
int is_vorbis;
long serialno = ogg_page_serialno ((ogg_page *)input->og);
if ((codec_name =
ot_page_identify (input->reader, input->og, NULL)) != NULL)
is_vorbis = !strcmp (codec_name, "Vorbis");
is_vorbis = (oggz_stream_get_content (input->reader, serialno) == OGGZ_CONTENT_VORBIS);
if (i == 0 && is_vorbis)
careful_for_theora = 0;
......
......@@ -262,18 +262,10 @@ oggz_sort (OSData * osdata, FILE * outfile)
min_i = i;
if (careful_for_theora) {
const char * codec_name;
int is_vorbis = 0;
if ((codec_name =
ot_page_identify (input->reader, input->og, NULL)) != NULL)
is_vorbis = !strcmp (codec_name, "Vorbis");
if (i == 0 && is_vorbis)
if (i == 0 && oggz_stream_get_content (input->reader, input->serialno) == OGGZ_CONTENT_VORBIS)
careful_for_theora = 0;
else
active = 0;
} else {
active = 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment