i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not reject an encoder based on the media_format_family if either the encoders

Browse Source 
or the given media_file_format family's is B_ANY_FORMAT_FAMILY.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32006 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-07-31 01:02:48 +00:00
parent 6033e52a83
commit cc1730f4d6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/MediaFormats.cpp
+8 -2
View File
@@ -50,8 +50,11 @@ get_next_encoder(int32* cookie, const media_file_format* fileFormat,
*cookie = *cookie + 1; *cookie = *cookie + 1;
if (fileFormat != NULL && fileFormat->family != reply.format_family) if (fileFormat != NULL && reply.format_family != B_ANY_FORMAT_FAMILY
&& fileFormat->family != B_ANY_FORMAT_FAMILY
&& fileFormat->family != reply.format_family) {
continue; continue;
}
if (!reply.input_format.Matches(inputFormat)) if (!reply.input_format.Matches(inputFormat))
continue; continue;
@@ -93,8 +96,11 @@ get_next_encoder(int32* cookie, const media_file_format* fileFormat,
*cookie = *cookie + 1; *cookie = *cookie + 1;
if (fileFormat != NULL && fileFormat->family != reply.format_family) if (fileFormat != NULL && reply.format_family != B_ANY_FORMAT_FAMILY
&& fileFormat->family != B_ANY_FORMAT_FAMILY
&& fileFormat->family != reply.format_family) {
continue; continue;
}
if (!reply.input_format.Matches(inputFormat) if (!reply.input_format.Matches(inputFormat)
|| !reply.output_format.Matches(outputFormat)) { || !reply.output_format.Matches(outputFormat)) {