| 0 | |
Description: Fix building against FFmpeg-5.1
|
| 1 | |
"private" members were removed from a public header...
|
| 2 | |
Author: IOhannes m zmölnig
|
| 3 | |
Bug: https://github.com/x42/xjadeo/issues/51
|
| 4 | |
Last-Update: 2022-08-30
|
| 5 | |
---
|
| 6 | |
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
| 7 | |
--- xjadeo.orig/src/xjadeo/xjadeo.c
|
| 8 | |
+++ xjadeo/src/xjadeo/xjadeo.c
|
| 9 | |
@@ -575,9 +575,7 @@
|
| 10 | |
seek = av_seek_frame (pFormatCtx, videoStream, fidx[framenumber].seekpts, AVSEEK_FLAG_BACKWARD);
|
| 11 | |
}
|
| 12 | |
|
| 13 | |
- if (pCodecCtx->codec->flush) {
|
| 14 | |
- avcodec_flush_buffers (pCodecCtx);
|
| 15 | |
- }
|
| 16 | |
+ avcodec_flush_buffers (pCodecCtx);
|
| 17 | |
|
| 18 | |
if (seek < 0) {
|
| 19 | |
if (!want_quiet)
|
| 20 | |
@@ -915,9 +913,7 @@
|
| 21 | |
error |= 16;
|
| 22 | |
break;
|
| 23 | |
}
|
| 24 | |
- if (pCodecCtx->codec->flush) {
|
| 25 | |
- avcodec_flush_buffers (pCodecCtx);
|
| 26 | |
- }
|
| 27 | |
+ avcodec_flush_buffers (pCodecCtx);
|
| 28 | |
|
| 29 | |
int err = 0;
|
| 30 | |
int bailout = 100;
|
| 31 | |
@@ -1053,9 +1049,7 @@
|
| 32 | |
printf("NOBYTE 2\n");
|
| 33 | |
break;
|
| 34 | |
}
|
| 35 | |
- if (pCodecCtx->codec->flush) {
|
| 36 | |
- avcodec_flush_buffers (pCodecCtx);
|
| 37 | |
- }
|
| 38 | |
+ avcodec_flush_buffers (pCodecCtx);
|
| 39 | |
|
| 40 | |
int64_t pts = AV_NOPTS_VALUE;
|
| 41 | |
while (!got_pic) {
|
| 42 | |
@@ -1118,9 +1112,7 @@
|
| 43 | |
} else {
|
| 44 | |
av_seek_frame (pFormatCtx, videoStream, fidx[i].seekpts, AVSEEK_FLAG_BACKWARD);
|
| 45 | |
}
|
| 46 | |
- if (pCodecCtx->codec->flush) {
|
| 47 | |
- avcodec_flush_buffers (pCodecCtx);
|
| 48 | |
- }
|
| 49 | |
+ avcodec_flush_buffers (pCodecCtx);
|
| 50 | |
while (!got_pic) {
|
| 51 | |
|
| 52 | |
if (av_read_frame (pFormatCtx, &packet) < 0) {
|
| 53 | |
@@ -1192,9 +1184,7 @@
|
| 54 | |
}
|
| 55 | |
|
| 56 | |
av_seek_frame (pFormatCtx, videoStream, 0, AVSEEK_FLAG_BACKWARD);
|
| 57 | |
- if (pCodecCtx->codec->flush) {
|
| 58 | |
- avcodec_flush_buffers (pCodecCtx);
|
| 59 | |
- }
|
| 60 | |
+ avcodec_flush_buffers (pCodecCtx);
|
| 61 | |
if (!error) {
|
| 62 | |
scan_complete = 1;
|
| 63 | |
}
|