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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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