projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ffmpeg git patches for version 7.0 + minor fixes
[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 e197e5fb4049946c7739c6f68cb0a1ee35cbc18a..b89b3afbcf9c1dae359d6e3508d2919d69e54c08 100644
(file)
--- a/
cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
+++ b/
cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
@@
-1,6
+1,6
@@
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
-@@ -
290,7 +29
0,7 @@
+@@ -
320,7 +32
0,7 @@
}
if (!frame->buf[0]) {
}
if (!frame->buf[0]) {
@@
-9,7
+9,7
@@
avci->frame_thread_encoder))
return AVERROR_EOF;
avci->frame_thread_encoder))
return AVERROR_EOF;
-@@ -3
09,8 +30
9,10 @@
+@@ -3
39,8 +33
9,10 @@
ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet);
}
ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet);
}
@@
-21,7
+21,7
@@
return ret;
}
return ret;
}
-@@ -
491,10 +493
,16 @@
+@@ -
515,10 +517
,16 @@
if (avci->draining)
return AVERROR_EOF;
if (avci->draining)
return AVERROR_EOF;