[FFmpeg-devel] [RFC] libavfilter audio framework - split patches
Michael Niedermayer
michaelni
Sun Jul 11 16:32:08 CEST 2010
On Sun, Jul 11, 2010 at 07:07:19AM -0700, S.N. Hemanth Meenakshisundaram wrote:
> S.N. Hemanth Meenakshisundaram wrote:
>>
>> I am sending out the working lavfi audio patches in the order Stefano
>> requested for easy committing.
>
> avfiltergraph.c changes. Only some cosmetic changes on this one.
> avfiltergraph.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
> 173464f98f57e42f3b091393ae8a8078f66f007d avfiltergraph.c.diff
> diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
> index 9ad6536..ff02d81 100644
> --- a/libavfilter/avfiltergraph.c
> +++ b/libavfilter/avfiltergraph.c
> @@ -111,13 +111,12 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
> int scaler_count = 0;
> char inst_name[30];
>
> - /* ask all the sub-filters for their supported colorspaces */
> - for(i = 0; i < graph->filter_count; i ++) {
> - if(graph->filters[i]->filter->query_formats)
> + /* ask all the sub-filters for their supported colorspaces/sample formats */
> + for (i = 0; i < graph->filter_count; i ++)
> + if (graph->filters[i]->filter->query_formats)
> graph->filters[i]->filter->query_formats(graph->filters[i]);
> else
> avfilter_default_query_formats(graph->filters[i]);
> - }
>
> /* go through and merge as many format lists as possible */
> for(i = 0; i < graph->filter_count; i ++) {
> @@ -170,7 +169,9 @@ static void pick_format(AVFilterLink *link)
> return;
>
> link->in_formats->format_count = 1;
> - link->format = link->in_formats->formats[0];
> +
> + if (link->type == AVMEDIA_TYPE_VIDEO) link->format = link->in_formats->formats[0];
> + else if (link->type == AVMEDIA_TYPE_AUDIO) link->aformat = link->in_formats->aformats[0];
>
the first hunk looks cosmetic (and i think the {} should stay)
the second hunk does not look cosmetic
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
it is not once nor twice but times without number that the same ideas make
their appearance in the world. -- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20100711/3a7a3078/attachment.pgp>
More information about the ffmpeg-devel
mailing list