Unified · Split
| @@ -196,39 +196,39 @@ void fg_free(FilterGraph **pfg) · 195 unmodified lines | ||
| 196 | 196 | if (!fg) |
| 197 | 197 | return; |
| 198 | 198 | |
| 199 | − avfilter_graph_free(&fg->graph); | |
| 200 | − for (int j = 0; j < fg->nb_inputs; j++) { | |
| 201 | − InputFilter *ifilter = fg->inputs[j]; | |
| 202 | − struct InputStream *ist = ifilter->ist; | |
| 203 | − | |
| 204 | − if (ifilter->frame_queue) { | |
| 205 | − AVFrame *frame; | |
| 206 | − while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0) | |
| 207 | − av_frame_free(&frame); | |
| 208 | − av_fifo_freep2(&ifilter->frame_queue); | |
| 209 | − } | |
| 210 | − av_freep(&ifilter->displaymatrix); | |
| 211 | − if (ist->sub2video.sub_queue) { | |
| 212 | − AVSubtitle sub; | |
| 213 | − while (av_fifo_read(ist->sub2video.sub_queue, &sub, 1) >= 0) | |
| 214 | − avsubtitle_free(&sub); | |
| 215 | − av_fifo_freep2(&ist->sub2video.sub_queue); | |
| 216 | − } | |
| 217 | − av_buffer_unref(&ifilter->hw_frames_ctx); | |
| 218 | − av_freep(&ifilter->name); | |
| 219 | − av_freep(&fg->inputs[j]); | |
| 199 | + avfilter_graph_free(&fg->graph); | |
| 200 | + for (int j = 0; j < fg->nb_inputs; j++) { | |
| 201 | + InputFilter *ifilter = fg->inputs[j]; | |
| 202 | + struct InputStream *ist = ifilter->ist; | |
| 203 | + | |
| 204 | + if (ifilter->frame_queue) { | |
| 205 | + AVFrame *frame; | |
| 206 | + while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0) | |
| 207 | + av_frame_free(&frame); | |
| 208 | + av_fifo_freep2(&ifilter->frame_queue); | |
| 220 | 209 | } |
| 221 | − av_freep(&fg->inputs); | |
| 222 | − for (int j = 0; j < fg->nb_outputs; j++) { | |
| 223 | − OutputFilter *ofilter = fg->outputs[j]; | |
| 224 | − | |
| 225 | − avfilter_inout_free(&ofilter->out_tmp); | |
| 226 | − av_freep(&ofilter->name); | |
| 227 | − av_channel_layout_uninit(&ofilter->ch_layout); | |
| 228 | − av_freep(&fg->outputs[j]); | |
| 210 | + av_freep(&ifilter->displaymatrix); | |
| 211 | + if (ist->sub2video.sub_queue) { | |
| 212 | + AVSubtitle sub; | |
| 213 | + while (av_fifo_read(ist->sub2video.sub_queue, &sub, 1) >= 0) | |
| 214 | + avsubtitle_free(&sub); | |
| 215 | + av_fifo_freep2(&ist->sub2video.sub_queue); | |
| 229 | 216 | } |
| 230 | − av_freep(&fg->outputs); | |
| 231 | − av_freep(&fg->graph_desc); | |
| 217 | + av_buffer_unref(&ifilter->hw_frames_ctx); | |
| 218 | + av_freep(&ifilter->name); | |
| 219 | + av_freep(&fg->inputs[j]); | |
| 220 | + } | |
| 221 | + av_freep(&fg->inputs); | |
| 222 | + for (int j = 0; j < fg->nb_outputs; j++) { | |
| 223 | + OutputFilter *ofilter = fg->outputs[j]; | |
| 224 | + | |
| 225 | + avfilter_inout_free(&ofilter->out_tmp); | |
| 226 | + av_freep(&ofilter->name); | |
| 227 | + av_channel_layout_uninit(&ofilter->ch_layout); | |
| 228 | + av_freep(&fg->outputs[j]); | |
| 229 | + } | |
| 230 | + av_freep(&fg->outputs); | |
| 231 | + av_freep(&fg->graph_desc); | |
| 232 | 232 | |
| 233 | 233 | av_freep(pfg); |
| 234 | 234 | } |