Skip to content

Commit

Permalink
Merge pull request #499 from nyanmisaka/fix-mpp-meta-not-found
Browse files Browse the repository at this point in the history
Fix MppPacket being released before MppMeta
  • Loading branch information
nyanmisaka authored Nov 14, 2024
2 parents af68c43 + cec35ee commit 1636376
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# We just wrap `build` so this is really it
name: "jellyfin-ffmpeg"
version: "7.0.2-6"
version: "7.0.2-7"
packages:
- bullseye-amd64
- bullseye-armhf
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
jellyfin-ffmpeg (7.0.2-7) unstable; urgency=medium

* Fix MppPacket being released before MppMeta

-- nyanmisaka <[email protected]> Thu, 14 Nov 2024 14:58:41 +0800

jellyfin-ffmpeg (7.0.2-6) unstable; urgency=medium

* Use dynamic pool for VPL QSV hwupload to save VRAM
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2714,7 +2714,6 @@ Index: FFmpeg/libavcodec/rkmppenc.c
+ ret = AVERROR_EXTERNAL;
+ goto exit;
+ }
+ mpp_packet_deinit(&mpp_pkt);
+
+ mpp_meta_get_s32(mpp_meta, KEY_OUTPUT_INTRA, &key_frame);
+ if (key_frame)
Expand All @@ -2734,6 +2733,7 @@ Index: FFmpeg/libavcodec/rkmppenc.c
+ mpp_buffer_set_index(mpp_buf, -1);
+ clear_unused_frames(r->frame_list);
+
+ mpp_packet_deinit(&mpp_pkt);
+ return 0;
+
+exit:
Expand Down

0 comments on commit 1636376

Please sign in to comment.