RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb' 

* commit '1dd35611433c224e2231ed7ae26b5b560863a3cb':
  vf_format: do not use the AVFilterFormats internals.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-18 12:46:54 +02:00
parent 71b7427e9b 1dd3561143
commit dd2eaf57b7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vf_format.c
View File

@ -81,15 +81,17 @@ static av_cold int init(AVFilterContext *ctx)
static AVFilterFormats *make_format_list(FormatContext *s, int flag)
{
AVFilterFormats *formats;
AVFilterFormats *formats = NULL;
enum AVPixelFormat pix_fmt;
formats = av_mallocz(sizeof(AVFilterFormats));
formats->formats = av_malloc(sizeof(enum AVPixelFormat) * AV_PIX_FMT_NB);
for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
if (s->listed_pix_fmt_flags[pix_fmt] == flag)
formats->formats[formats->nb_formats++] = pix_fmt;
if (s->listed_pix_fmt_flags[pix_fmt] == flag) {
int ret = ff_add_format(&formats, pix_fmt);
if (ret < 0) {
ff_formats_unref(&formats);
return NULL;
}
}
return formats;
}