- formatting code using astyle

Conflicts:
	libarmbox/dmx.cpp
	libgeneric-pc/video_lib.h
	libspark/dmx.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-05-17 23:47:39 +02:00
committed by Thilo Graf
parent 42264ba4af
commit 7e5b1fc5d2
161 changed files with 13043 additions and 11396 deletions

View File

@@ -39,21 +39,21 @@ extern "C" {
/* wrapper */
#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(57,25,100)
static AVCodecParameters __attribute__ ((unused)) *get_codecpar(AVStream *stream)
static AVCodecParameters __attribute__((unused)) *get_codecpar(AVStream *stream)
{
return stream->codecpar;
}
#else
static AVCodecContext __attribute__ ((unused)) *get_codecpar(AVStream *stream)
static AVCodecContext __attribute__((unused)) *get_codecpar(AVStream *stream)
{
return stream->codec;
}
#endif
#if (LIBAVCODEC_VERSION_MAJOR > 55)
#define av_free_packet av_packet_unref
#define av_free_packet av_packet_unref
#else
#define av_packet_unref av_free_packet
#define av_packet_unref av_free_packet
#endif
/* end wrapper */
@@ -71,7 +71,11 @@ class Writer
static audio_encoding_t GetAudioEncoding(enum AVCodecID id);
static Writer *GetWriter(enum AVCodecID id, enum AVMediaType codec_type, int track_type);
virtual void Init(int _fd, AVStream * /*stream*/, Player *_player ) { fd = _fd; player = _player; }
virtual void Init(int _fd, AVStream * /*stream*/, Player *_player)
{
fd = _fd;
player = _player;
}
virtual bool Write(AVPacket *packet, int64_t pts);
};
#endif