← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavfilter/asrc_anullsrc.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavfilter/asrc_anullsrc.c
68
68
                                     null->sample_rate_str, ctx)) < 0)
69
69
        return ret;
70
70
 
71
 
    if ((ret = ff_parse_channel_layout(&null->channel_layout,
 
71
    if ((ret = ff_parse_channel_layout(&null->channel_layout, NULL,
72
72
                                        null->channel_layout_str, ctx)) < 0)
73
73
        return ret;
74
74
 
134
134
    { NULL }
135
135
};
136
136
 
137
 
AVFilter avfilter_asrc_anullsrc = {
 
137
AVFilter ff_asrc_anullsrc = {
138
138
    .name          = "anullsrc",
139
139
    .description   = NULL_IF_CONFIG_SMALL("Null audio source, return empty audio frames."),
140
140
    .init          = init,