History

Revert "avfilter: deprecate avfilter_link_get_channels()"

This reverts commit 798dcf2432999f449c76c0e0fe2d7a4ee5eabbc2. It was applied by accident before it could be reviewed.

James Almer committed 8 years ago

Commit da5b05c1 parent 503164b4 files · +6 −20Browse files

Showing the changes to libavfilter/avfilter.h (1 of 4 files). Show all

Unified · Split

libavfilter/avfilter.h+5−10
@@ -448,11 +448,6 @@ struct AVFilterLink { · 447 unmodified lines
448448 */
449449 AVRational time_base;
450450
451− /**
452− * Number of channels.
453− */
454− int channels;
455−
456451 /*****************************************************************
457452 * All fields below this line are not part of the public API. They
458453 * may not be used outside of libavfilter and can be changed and
@@ -556,6 +551,11 @@ struct AVFilterLink { · 97 unmodified lines
556551 */
557552 int max_samples;
558553
554+ /**
555+ * Number of channels.
556+ */
557+ int channels;
558+
559559 /**
560560 * Link processing flags.
561561 */
@@ -647,15 +647,10 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, · 85 unmodified lines
647647 */
648648 void avfilter_link_free(AVFilterLink **link);
649649
650−#if FF_API_FILTER_GET_SET
651650 /**
652651 * Get the number of channels of a link.
653− * @deprecated This accessor used to be provided for ABI compatibility, and
654− * does not need to be used anymore.
655652 */
656−attribute_deprecated
657653 int avfilter_link_get_channels(AVFilterLink *link);
658−#endif
659654
660655 /**
661656 * Set the closed field of a link.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t