summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-06 21:00:50 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-05-10 07:42:46 +0200
commitf104352b918c8ec8f74c0e974cd11e366275e8e9 (patch)
tree55b79d7722b10e011ec492d6c92db89720b5cd9d /libavformat/utils.c
parent92a43ad3842b8422dd0e88cfd66cf0f284e5015a (diff)
downloadffmpeg-f104352b918c8ec8f74c0e974cd11e366275e8e9.tar.gz
avformat/utils: Move ff_add_param_change to demux_utils.c
Only demuxers have a need to add side-data to a packet. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c53
1 files changed, 1 insertions, 52 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9e2e3335ac..5249607745 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -28,13 +28,13 @@
#include "libavutil/bprint.h"
#include "libavutil/dict.h"
#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#include "libavutil/pixfmt.h"
#include "libavutil/thread.h"
#include "libavutil/time.h"
#include "libavcodec/bsf.h"
-#include "libavcodec/bytestream.h"
#include "libavcodec/internal.h"
#include "libavcodec/packet_internal.h"
@@ -1007,57 +1007,6 @@ int avformat_network_deinit(void)
return 0;
}
-int ff_add_param_change(AVPacket *pkt, int32_t channels,
- uint64_t channel_layout, int32_t sample_rate,
- int32_t width, int32_t height)
-{
- uint32_t flags = 0;
- int size = 4;
- uint8_t *data;
- if (!pkt)
- return AVERROR(EINVAL);
-
-#if FF_API_OLD_CHANNEL_LAYOUT
-FF_DISABLE_DEPRECATION_WARNINGS
- if (channels) {
- size += 4;
- flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT;
- }
- if (channel_layout) {
- size += 8;
- flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT;
- }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
- if (sample_rate) {
- size += 4;
- flags |= AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE;
- }
- if (width || height) {
- size += 8;
- flags |= AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS;
- }
- data = av_packet_new_side_data(pkt, AV_PKT_DATA_PARAM_CHANGE, size);
- if (!data)
- return AVERROR(ENOMEM);
- bytestream_put_le32(&data, flags);
-#if FF_API_OLD_CHANNEL_LAYOUT
-FF_DISABLE_DEPRECATION_WARNINGS
- if (channels)
- bytestream_put_le32(&data, channels);
- if (channel_layout)
- bytestream_put_le64(&data, channel_layout);
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
- if (sample_rate)
- bytestream_put_le32(&data, sample_rate);
- if (width || height) {
- bytestream_put_le32(&data, width);
- bytestream_put_le32(&data, height);
- }
- return 0;
-}
-
AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame)
{
AVRational undef = {0, 1};