~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavfilter/vf_subtitles.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:
228
228
    return 0;
229
229
}
230
230
 
231
 
AVFilter avfilter_vf_ass = {
 
231
AVFilter ff_vf_ass = {
232
232
    .name          = "ass",
233
233
    .description   = NULL_IF_CONFIG_SMALL("Render ASS subtitles onto input video using the libass library."),
234
234
    .priv_size     = sizeof(AssContext),
352
352
    return ret;
353
353
}
354
354
 
355
 
AVFilter avfilter_vf_subtitles = {
 
355
AVFilter ff_vf_subtitles = {
356
356
    .name          = "subtitles",
357
357
    .description   = NULL_IF_CONFIG_SMALL("Render text subtitles onto input video using the libass library."),
358
358
    .priv_size     = sizeof(AssContext),