The next pointer is kept at the end for backwards compatability until the major bump, when it should ideally be moved at the front.
Showing the changes to libavdevice/decklink_dec.cpp (1 of 16 files). Show all
Unified · Split
| @@ -35,6 +35,7 @@ extern "C" { · 34 unmodified lines | ||
| 35 | 35 | |
| 36 | 36 | extern "C" { |
| 37 | 37 | #include "config.h" |
| 38 | +#include "libavcodec/packet_internal.h" | |
| 38 | 39 | #include "libavformat/avformat.h" |
| 39 | 40 | #include "libavutil/avassert.h" |
| 40 | 41 | #include "libavutil/avutil.h" |
| @@ -482,7 +483,7 @@ static void avpacket_queue_init(AVFormatContext *avctx, AVPacketQueue *q) · 441 unmodified lines | ||
| 482 | 483 | |
| 483 | 484 | static void avpacket_queue_flush(AVPacketQueue *q) |
| 484 | 485 | { |
| 485 | − AVPacketList *pkt, *pkt1; | |
| 486 | + PacketList *pkt, *pkt1; | |
| 486 | 487 | |
| 487 | 488 | pthread_mutex_lock(&q->mutex); |
| 488 | 489 | for (pkt = q->first_pkt; pkt != NULL; pkt = pkt1) { |
| @@ -515,7 +516,7 @@ static unsigned long long avpacket_queue_size(AVPacketQueue *q) · 26 unmodified lines | ||
| 515 | 516 | |
| 516 | 517 | static int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt) |
| 517 | 518 | { |
| 518 | − AVPacketList *pkt1; | |
| 519 | + PacketList *pkt1; | |
| 519 | 520 | |
| 520 | 521 | // Drop Packet if queue size is > maximum queue size |
| 521 | 522 | if (avpacket_queue_size(q) > (uint64_t)q->max_q_size) { |
| @@ -529,7 +530,7 @@ static int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt) · 7 unmodified lines | ||
| 529 | 530 | return -1; |
| 530 | 531 | } |
| 531 | 532 | |
| 532 | − pkt1 = (AVPacketList *)av_malloc(sizeof(AVPacketList)); | |
| 533 | + pkt1 = (PacketList *)av_malloc(sizeof(PacketList)); | |
| 533 | 534 | if (!pkt1) { |
| 534 | 535 | av_packet_unref(pkt); |
| 535 | 536 | return -1; |
| @@ -557,7 +558,7 @@ static int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt) · 21 unmodified lines | ||
| 557 | 558 | |
| 558 | 559 | static int avpacket_queue_get(AVPacketQueue *q, AVPacket *pkt, int block) |
| 559 | 560 | { |
| 560 | − AVPacketList *pkt1; | |
| 561 | + PacketList *pkt1; | |
| 561 | 562 | int ret; |
| 562 | 563 | |
| 563 | 564 | pthread_mutex_lock(&q->mutex); |