* qatar/master: (26 commits) fate: use diff -b in oneline comparison Add missing version bumps and APIchanges/Changelog entries. lavfi: move buffer management function to a separate file. lavfi: move formats-related functions from default.c to formats.c lavfi: move video-related functions to a separate file. fate: make smjpeg a demux test fate: separate sierra-vmd audio and video tests fate: separate smacker audio and video tests libmp3lame: set supported channel layouts. avconv: automatically insert asyncts when -async is used. avconv: add support for audio filters. lavfi: add asyncts filter. lavfi: add aformat filter lavfi: add an audio buffer sink. lavfi: add an audio buffer source. buffersrc: add av_buffersrc_write_frame(). buffersrc: fix invalid read in uninit if the fifo hasn't been allocated lavfi: rename vsrc_buffer.c to buffersrc.c avfiltergraph: reindent lavfi: add channel layout/sample rate negotiation. ... Conflicts: Changelog doc/APIchanges doc/filters.texi ffmpeg.c ffprobe.c libavcodec/libmp3lame.c libavfilter/Makefile libavfilter/af_aformat.c libavfilter/allfilters.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/defaults.c libavfilter/formats.c libavfilter/src_buffer.c libavfilter/version.h libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c libavfilter/vsrc_buffer.h libavutil/avutil.h tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak
Showing the changes to libavfilter/avfilter.h (1 of 52 files). Show all
Unified · Split
| @@ -258,8 +258,8 @@ void avfilter_unref_bufferp(AVFilterBufferRef **ref); · 257 unmodified lines | ||
| 258 | 258 | * pointer to each of the pointers to itself. |
| 259 | 259 | */ |
| 260 | 260 | typedef struct AVFilterFormats { |
| 261 | − unsigned format_count; ///< number of formats | |
| 262 | 261 | int64_t *formats; ///< list of media formats |
| 262 | + unsigned format_count; ///< number of formats | |
| 263 | 263 | |
| 264 | 264 | unsigned refcount; ///< number of references to this list |
| 265 | 265 | struct AVFilterFormats ***refs; ///< references to this list |
| @@ -274,7 +274,6 @@ typedef struct AVFilterFormats { · 8 unmodified lines | ||
| 274 | 274 | * @return the format list, with no existing references |
| 275 | 275 | */ |
| 276 | 276 | AVFilterFormats *avfilter_make_format_list(const int *fmts); |
| 277 | −AVFilterFormats *avfilter_make_format64_list(const int64_t *fmts); | |
| 278 | 277 | |
| 279 | 278 | /** |
| 280 | 279 | * Add fmt to the list of media formats contained in *avff. |
| @@ -304,11 +303,6 @@ AVFilterFormats *avfilter_make_all_formats(enum AVMediaType type); · 23 unmodified lines | ||
| 304 | 303 | */ |
| 305 | 304 | extern const int64_t avfilter_all_channel_layouts[]; |
| 306 | 305 | |
| 307 | −/** | |
| 308 | − * Return a list of all channel layouts supported by FFmpeg. | |
| 309 | − */ | |
| 310 | −AVFilterFormats *avfilter_make_all_channel_layouts(void); | |
| 311 | − | |
| 312 | 306 | /** |
| 313 | 307 | * Return a list of all audio packing formats. |
| 314 | 308 | */ |
| @@ -521,6 +515,7 @@ AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, · 206 unmodified lines | ||
| 521 | 515 | * formats/layouts. If there are no links hooked to this filter, the list |
| 522 | 516 | * of formats is freed. |
| 523 | 517 | */ |
| 518 | +void avfilter_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats); | |
| 524 | 519 | void avfilter_set_common_pixel_formats(AVFilterContext *ctx, AVFilterFormats *formats); |
| 525 | 520 | void avfilter_set_common_sample_formats(AVFilterContext *ctx, AVFilterFormats *formats); |
| 526 | 521 | void avfilter_set_common_channel_layouts(AVFilterContext *ctx, AVFilterFormats *formats); |
| @@ -674,8 +669,6 @@ struct AVFilterLink { · 147 unmodified lines | ||
| 674 | 669 | AVFilterFormats *in_formats; |
| 675 | 670 | AVFilterFormats *out_formats; |
| 676 | 671 | |
| 677 | − AVFilterFormats *in_chlayouts; | |
| 678 | − AVFilterFormats *out_chlayouts; | |
| 679 | 672 | AVFilterFormats *in_packing; |
| 680 | 673 | AVFilterFormats *out_packing; |
| 681 | 674 | |
| @@ -713,17 +706,26 @@ struct AVFilterLink { · 31 unmodified lines | ||
| 713 | 706 | */ |
| 714 | 707 | int64_t current_pts; |
| 715 | 708 | |
| 716 | − /** | |
| 717 | − * Private fields | |
| 718 | − * | |
| 719 | − * The following fields are for internal use only. | |
| 720 | − * Their type, offset, number and semantic can change without notice. | |
| 709 | + /***************************************************************** | |
| 710 | + * All fields below this line are not part of the public API. They | |
| 711 | + * may not be used outside of libavfilter and can be changed and | |
| 712 | + * removed at will. | |
| 713 | + * New public fields should be added right above. | |
| 714 | + ***************************************************************** | |
| 721 | 715 | */ |
| 722 | − | |
| 723 | 716 | /** |
| 724 | 717 | * Index in the age array. |
| 725 | 718 | */ |
| 726 | 719 | int age_index; |
| 720 | + | |
| 721 | + /** | |
| 722 | + * Lists of channel layouts and sample rates used for automatic | |
| 723 | + * negotiation. | |
| 724 | + */ | |
| 725 | + AVFilterFormats *in_samplerates; | |
| 726 | + AVFilterFormats *out_samplerates; | |
| 727 | + struct AVFilterChannelLayouts *in_channel_layouts; | |
| 728 | + struct AVFilterChannelLayouts *out_channel_layouts; | |
| 727 | 729 | }; |
| 728 | 730 | |
| 729 | 731 | /** |