Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix build with ffmpeg 5.0

Browse source 
PR #2948 <https://github.com/Genymobile/scrcpy/pull/2948>

Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
Signed-off-by: Romain Vimont <rom@rom1v.com>
This commit is contained in:
Bernhard Rosenkränzer 2022-01-16 01:45:36 +01:00 committed by Romain Vimont
parent 60bf133ac2
commit 5e8fa56e7a
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/decoder.h
View file

@ -6,6 +6,7 @@
#include "trait/packet_sink.h" #include "trait/packet_sink.h"
#include <stdbool.h> #include <stdbool.h>
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#define DECODER_MAX_SINKS 2 #define DECODER_MAX_SINKS 2

3
app/src/icon.c
View file

@ -2,6 +2,7 @@
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libavutil/pixdesc.h> #include <libavutil/pixdesc.h>
#include <libavutil/pixfmt.h> #include <libavutil/pixfmt.h>
@ -85,7 +86,7 @@ decode_image(const char *path) {
AVCodecParameters *params = ctx->streams[stream]->codecpar; AVCodecParameters *params = ctx->streams[stream]->codecpar;
AVCodec *codec = avcodec_find_decoder(params->codec_id); const AVCodec *codec = avcodec_find_decoder(params->codec_id);
if (!codec) { if (!codec) {
LOGE("Could not find image decoder"); LOGE("Could not find image decoder");
goto close_input; goto close_input;

3
app/src/stream.c
View file

@ -1,7 +1,6 @@
#include "stream.h" #include "stream.h"
#include <assert.h> #include <assert.h>
#include <libavformat/avformat.h>
#include <libavutil/time.h> #include <libavutil/time.h>
#include <unistd.h> #include <unistd.h>
@ -192,7 +191,7 @@ static int
run_stream(void *data) { run_stream(void *data) {
struct stream *stream = data; struct stream *stream = data;
AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_H264); const AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_H264);
if (!codec) { if (!codec) {
LOGE("H.264 decoder not found"); LOGE("H.264 decoder not found");
goto end; goto end;

1
app/src/stream.h
View file

@ -5,6 +5,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include "trait/packet_sink.h" #include "trait/packet_sink.h"

5
app/src/v4l2_sink.h
View file

@ -3,13 +3,14 @@
#include "common.h" #include "common.h"
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include "coords.h" #include "coords.h"
#include "trait/frame_sink.h" #include "trait/frame_sink.h"
#include "video_buffer.h" #include "video_buffer.h"
#include "util/tick.h" #include "util/tick.h"
#include <libavformat/avformat.h>
struct sc_v4l2_sink { struct sc_v4l2_sink {
struct sc_frame_sink frame_sink; // frame sink trait struct sc_frame_sink frame_sink; // frame sink trait