diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:50:09 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:50:09 +0200 |
| commit | 87c88122703f2befcf96383d05bdf14373c22df9 (patch) | |
| tree | 440194d29f606b9926ad57b9a15d0709ee12ccd7 /libavdevice | |
| parent | b27ddffbfb29f456d43c2f155eef5230b940a48b (diff) | |
| parent | 01bcc2d5c23fa757d163530abb396fd02f1be7c8 (diff) | |
| download | ffmpeg-streaming-87c88122703f2befcf96383d05bdf14373c22df9.zip ffmpeg-streaming-87c88122703f2befcf96383d05bdf14373c22df9.tar.gz | |
Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8'
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
lavc: Drop deprecated destruct_packet related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/v4l2.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index d198abc..2b38a00 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -394,13 +394,6 @@ static int mmap_init(AVFormatContext *ctx) return 0; } -#if FF_API_DESTRUCT_PACKET -static void dummy_release_buffer(AVPacket *pkt) -{ - av_assert0(0); -} -#endif - static int enqueue_buffer(struct video_data *s, struct v4l2_buffer *buf) { int res = 0; @@ -565,11 +558,6 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) pkt->data = s->buf_start[buf.index]; pkt->size = buf.bytesused; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = dummy_release_buffer; -FF_ENABLE_DEPRECATION_WARNINGS -#endif buf_descriptor = av_malloc(sizeof(struct buff_data)); if (!buf_descriptor) { |
