virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avformat/avienc, wtvenc: Deduplicate codec tags list

Browse Source 
Also saves relocations.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-02-18 03:26:57 +01:00
parent 08b4a25ff9
commit 09e6d3a026
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avienc.c
View File

@ -1018,8 +1018,6 @@ AVOutputFormat ff_avi_muxer = {
.write_header = avi_write_header, .write_header = avi_write_header,
.write_packet = avi_write_packet, .write_packet = avi_write_packet,
.write_trailer = avi_write_trailer, .write_trailer = avi_write_trailer,
.codec_tag = (const AVCodecTag * const []) { .codec_tag = ff_riff_codec_tags_list,
ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
.priv_class = &avi_muxer_class, .priv_class = &avi_muxer_class,
}; };

7
libavformat/riff.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "config.h"
#include "libavutil/error.h" #include "libavutil/error.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "avformat.h" #include "avformat.h"
@ -589,6 +590,12 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_NONE, 0 }, { AV_CODEC_ID_NONE, 0 },
}; };
#if CONFIG_AVI_MUXER || CONFIG_WTV_MUXER
const AVCodecTag *const ff_riff_codec_tags_list[] = {
ff_codec_bmp_tags, ff_codec_wav_tags, NULL
};
#endif
const AVMetadataConv ff_riff_info_conv[] = { const AVMetadataConv ff_riff_info_conv[] = {
{ "IART", "artist" }, { "IART", "artist" },
{ "ICMT", "comment" }, { "ICMT", "comment" },

2
libavformat/riff.h
View File

@ -72,6 +72,8 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *pa
extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags() extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags()
extern const AVCodecTag ff_codec_wav_tags[]; extern const AVCodecTag ff_codec_wav_tags[];
/* The following list contains both ff_codec_bmp_tags and ff_codec_wav_tags. */
extern const AVCodecTag *const ff_riff_codec_tags_list[];
extern const AVCodecTag ff_codec_bmp_tags_unofficial[]; extern const AVCodecTag ff_codec_bmp_tags_unofficial[];

3
libavformat/wtvenc.c
View File

@ -839,6 +839,5 @@ AVOutputFormat ff_wtv_muxer = {
.write_header = write_header, .write_header = write_header,
.write_packet = write_packet, .write_packet = write_packet,
.write_trailer = write_trailer, .write_trailer = write_trailer,
.codec_tag = (const AVCodecTag* const []){ ff_codec_bmp_tags, .codec_tag = ff_riff_codec_tags_list,
ff_codec_wav_tags, 0 },
}; };