ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin 2025-05-06 15:27:33 +04:00
commit ad5b0c3a6a
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/FFMpegBinding/Sources/FFMpegAVCodec.m
View File

@ -1,6 +1,6 @@
#import <FFMpegBinding/FFMpegAVCodec.h> #import <FFMpegBinding/FFMpegAVCodec.h>
#import <third_party/ffmpeg/libavcodec/avcodec.h> #import "libavcodec/avcodec.h"
@interface FFMpegAVCodec () { @interface FFMpegAVCodec () {
AVCodec const *_impl; AVCodec const *_impl;

4
submodules/FFMpegBinding/Sources/FFMpegAVCodecContext.m
View File

@ -3,8 +3,8 @@
#import <FFMpegBinding/FFMpegAVFrame.h> #import <FFMpegBinding/FFMpegAVFrame.h>
#import <FFMpegBinding/FFMpegAVCodec.h> #import <FFMpegBinding/FFMpegAVCodec.h>
#import <third_party/ffmpeg/libavformat/avformat.h> #import "libavformat/avformat.h"
#import <third_party/ffmpeg/libavcodec/avcodec.h> #import "libavcodec/avcodec.h"
static enum AVPixelFormat getPreferredPixelFormat(__unused AVCodecContext *ctx, __unused const enum AVPixelFormat *pix_fmts) { static enum AVPixelFormat getPreferredPixelFormat(__unused AVCodecContext *ctx, __unused const enum AVPixelFormat *pix_fmts) {
return AV_PIX_FMT_VIDEOTOOLBOX; return AV_PIX_FMT_VIDEOTOOLBOX;

4
submodules/FFMpegBinding/Sources/FFMpegAVFormatContext.m
View File

@ -4,8 +4,8 @@
#import <FFMpegBinding/FFMpegPacket.h> #import <FFMpegBinding/FFMpegPacket.h>
#import <FFMpegBinding/FFMpegAVCodecContext.h> #import <FFMpegBinding/FFMpegAVCodecContext.h>
#import <third_party/ffmpeg/libavcodec/avcodec.h> #import "libavcodec/avcodec.h"
#import <third_party/ffmpeg/libavformat/avformat.h> #import "libavformat/avformat.h"
int FFMpegCodecIdH264 = AV_CODEC_ID_H264; int FFMpegCodecIdH264 = AV_CODEC_ID_H264;
int FFMpegCodecIdHEVC = AV_CODEC_ID_HEVC; int FFMpegCodecIdHEVC = AV_CODEC_ID_HEVC;

2
submodules/FFMpegBinding/Sources/FFMpegAVFrame.m
View File

@ -1,6 +1,6 @@
#import <FFMpegBinding/FFMpegAVFrame.h> #import <FFMpegBinding/FFMpegAVFrame.h>
#import <third_party/ffmpeg/libavformat/avformat.h> #import "libavformat/avformat.h"
@interface FFMpegAVFrame () { @interface FFMpegAVFrame () {
AVFrame *_impl; AVFrame *_impl;

2
submodules/FFMpegBinding/Sources/FFMpegAVIOContext.m
View File

@ -1,6 +1,6 @@
#import <FFMpegBinding/FFMpegAVIOContext.h> #import <FFMpegBinding/FFMpegAVIOContext.h>
#import <third_party/ffmpeg/libavformat/avformat.h> #import "libavformat/avformat.h"
int FFMPEG_CONSTANT_AVERROR_EOF = AVERROR_EOF; int FFMPEG_CONSTANT_AVERROR_EOF = AVERROR_EOF;

2
submodules/FFMpegBinding/Sources/FFMpegGlobals.m
View File

@ -1,6 +1,6 @@
#import <FFMpegBinding/FFMpegGlobals.h> #import <FFMpegBinding/FFMpegGlobals.h>
#import <third_party/ffmpeg/libavformat/avformat.h> #import "libavformat/avformat.h"
@implementation FFMpegGlobals @implementation FFMpegGlobals

8
submodules/FFMpegBinding/Sources/FFMpegLiveMuxer.m
View File

@ -1,10 +1,10 @@
#import <FFMpegBinding/FFMpegLiveMuxer.h> #import <FFMpegBinding/FFMpegLiveMuxer.h>
#import <FFMpegBinding/FFMpegAVIOContext.h> #import <FFMpegBinding/FFMpegAVIOContext.h>
#include <third_party/ffmpeg/libavutil/timestamp.h> #include "libavutil/timestamp.h"
#include <third_party/ffmpeg/libavformat/avformat.h> #include "libavformat/avformat.h">"
#include <third_party/ffmpeg/libavcodec/avcodec.h> #include "libavcodec/avcodec.h">"
#include <third_party/ffmpeg/libswresample/swresample.h> #include "libswresample/swresample.h"
#define MOV_TIMESCALE 1000 #define MOV_TIMESCALE 1000

4
submodules/FFMpegBinding/Sources/FFMpegPacket.m
View File

@ -2,8 +2,8 @@
#import <FFMpegBinding/FFMpegAVCodecContext.h> #import <FFMpegBinding/FFMpegAVCodecContext.h>
#import <third_party/ffmpeg/libavcodec/avcodec.h> #import "libavcodec/avcodec.h"
#import <third_party/ffmpeg/libavformat/avformat.h> #import "libavformat/avformat.h"
@interface FFMpegPacket () { @interface FFMpegPacket () {
AVPacket *_impl; AVPacket *_impl;

6
submodules/FFMpegBinding/Sources/FFMpegRemuxer.m
View File

@ -2,9 +2,9 @@
#import <FFMpegBinding/FFMpegAVIOContext.h> #import <FFMpegBinding/FFMpegAVIOContext.h>
#include <third_party/ffmpeg/libavutil/timestamp.h> #include "libavutil/timestamp.h"
#include <third_party/ffmpeg/libavformat/avformat.h> #include "libavformat/avformat.h"
#include <third_party/ffmpeg/libavcodec/avcodec.h> #include "libavcodec/avcodec.h"
#define MOV_TIMESCALE 1000 #define MOV_TIMESCALE 1000

6
submodules/FFMpegBinding/Sources/FFMpegSWResample.m
View File

@ -2,9 +2,9 @@
#import <FFMpegBinding/FFMpegAVFrame.h> #import <FFMpegBinding/FFMpegAVFrame.h>
#import <third_party/ffmpeg/libavformat/avformat.h> #import "libavformat/avformat.h"
#import <third_party/ffmpeg/libavcodec/avcodec.h> #import "libavcodec/avcodec.h"
#import <third_party/ffmpeg/libswresample/swresample.h> #import "libswresample/swresample.h"
@interface FFMpegSWResample () { @interface FFMpegSWResample () {
int _sourceSampleRate; int _sourceSampleRate;

6
submodules/FFMpegBinding/Sources/FFMpegVideoWriter.m
View File

@ -1,9 +1,9 @@
#import <FFMpegBinding/FFMpegVideoWriter.h> #import <FFMpegBinding/FFMpegVideoWriter.h>
#import <FFMpegBinding/FFMpegAVFrame.h> #import <FFMpegBinding/FFMpegAVFrame.h>
#include <third_party/ffmpeg/libavformat/avformat.h> #include "libavformat/avformat.h"
#include <third_party/ffmpeg/libavcodec/avcodec.h> #include "libavcodec/avcodec.h"
#include <third_party/ffmpeg/libavutil/imgutils.h> #include "libavutil/imgutils.h"
@interface FFMpegVideoWriter () @interface FFMpegVideoWriter ()