projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mjpegtools library update from 2.1.0 to 2.2.1 as discovered needed by Andrea for...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
thirdparty
/
src
/
ffmpeg.git.patchC
diff --git
a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
index bce5202ef8ab5a1e3d0647e944af15386eb0f3d2..b89b3afbcf9c1dae359d6e3508d2919d69e54c08 100644
(file)
--- a/
cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
+++ b/
cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
@@
-1,16
+1,16
@@
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
-@@ -
191,7 +191
,7 @@
+@@ -
320,7 +320
,7 @@
}
if (!frame->buf[0]) {
- if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY ||
+ if (avci->draining && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY ||
}
if (!frame->buf[0]) {
- if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY ||
+ if (avci->draining && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY ||
-
(avci->frame_thread_encoder && avctx->active_thread_type & FF_THREAD_FRAME)
))
+
avci->frame_thread_encoder
))
return AVERROR_EOF;
return AVERROR_EOF;
-@@ -
243,8 +243
,10 @@
-
avpkt->flags |= avci->intra_only_flag
;
+@@ -
339,8 +339
,10 @@
+
ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet)
;
}
- if (avci->draining && !got_packet)
}
- if (avci->draining && !got_packet)
@@
-19,9
+19,9
@@
avci->draining_done = 1;
+ }
avci->draining_done = 1;
+ }
- end:
- if (ret < 0 || !got_packet)
-@@ -
365,10 +36
7,16 @@
+ return ret;
+ }
+@@ -
515,10 +51
7,16 @@
if (avci->draining)
return AVERROR_EOF;
if (avci->draining)
return AVERROR_EOF;