Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(330)

Side by Side Diff: source/patched-ffmpeg-mt/libavfilter/formats.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Filter layer - format negotiation 2 * Filter layer - format negotiation
3 * copyright (c) 2007 Bobby Bingham 3 * copyright (c) 2007 Bobby Bingham
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 100
101 (*avff)->formats = fmts; 101 (*avff)->formats = fmts;
102 (*avff)->formats[(*avff)->format_count++] = fmt; 102 (*avff)->formats[(*avff)->format_count++] = fmt;
103 return 0; 103 return 0;
104 } 104 }
105 105
106 AVFilterFormats *avfilter_all_formats(enum AVMediaType type) 106 AVFilterFormats *avfilter_all_formats(enum AVMediaType type)
107 { 107 {
108 AVFilterFormats *ret = NULL; 108 AVFilterFormats *ret = NULL;
109 int fmt; 109 int fmt;
110 int num_formats = type == AVMEDIA_TYPE_VIDEO ? PIX_FMT_NB : 0; 110 int num_formats = type == AVMEDIA_TYPE_VIDEO ? PIX_FMT_NB :
111 type == AVMEDIA_TYPE_AUDIO ? SAMPLE_FMT_NB : 0;
111 112
112 for (fmt = 0; fmt < num_formats; fmt++) 113 for (fmt = 0; fmt < num_formats; fmt++)
113 if ((type != AVMEDIA_TYPE_VIDEO) || 114 if ((type != AVMEDIA_TYPE_VIDEO) ||
114 (type == AVMEDIA_TYPE_VIDEO && !(av_pix_fmt_descriptors[fmt].flags & PIX_FMT_HWACCEL))) 115 (type == AVMEDIA_TYPE_VIDEO && !(av_pix_fmt_descriptors[fmt].flags & PIX_FMT_HWACCEL)))
115 avfilter_add_format(&ret, fmt); 116 avfilter_add_format(&ret, fmt);
116 117
117 return ret; 118 return ret;
118 } 119 }
119 120
120 void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref) 121 void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 { 160 {
160 int idx = find_ref_index(oldref); 161 int idx = find_ref_index(oldref);
161 162
162 if(idx >= 0) { 163 if(idx >= 0) {
163 (*oldref)->refs[idx] = newref; 164 (*oldref)->refs[idx] = newref;
164 *newref = *oldref; 165 *newref = *oldref;
165 *oldref = NULL; 166 *oldref = NULL;
166 } 167 }
167 } 168 }
168 169
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavfilter/defaults.c ('k') | source/patched-ffmpeg-mt/libavfilter/graphparser.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698