Hi!
This was apparently forgotten after the bump.
Please comment, Carl Eugen
From 640a993f88d492045d95563e4c35843805654688 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffm...@gmail.com>
Date: Thu, 26 Oct 2017 22:49:39 +0200
Subject: [PATCH] lavf: Remove AVFMT_RAWPICTURE.
Deprecated since October 2015.
---
fftools/ffmpeg.c | 18 ------------------
libavformat/avformat.h | 4 ----
libavformat/version.h | 3 ---
3 files changed, 25 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index d581b40..8fe66f5 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1991,7 +1991,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
InputFile *f = input_files [ist->file_index];
int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase);
- AVPicture pict;
AVPacket opkt;
av_init_packet(&opkt);
@@ -2079,23 +2078,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
}
av_copy_packet_side_data(&opkt, pkt);
-#if FF_API_LAVF_FMT_RAWPICTURE
- if (ost->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
- ost->st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO &&
- (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
- /* store AVPicture in AVPacket, as expected by the output format */
- int ret = avpicture_fill(&pict, opkt.data, ost->st->codecpar->format, ost->st->codecpar->width, ost->st->codecpar->height);
- if (ret < 0) {
- av_log(NULL, AV_LOG_FATAL, "avpicture_fill failed: %s\n",
- av_err2str(ret));
- exit_program(1);
- }
- opkt.data = (uint8_t *)&pict;
- opkt.size = sizeof(AVPicture);
- opkt.flags |= AV_PKT_FLAG_KEY;
- }
-#endif
-
output_packet(of, &opkt, ost, 0);
}
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index ece1b17..65fc9ea 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -465,10 +465,6 @@ typedef struct AVProbeData {
#define AVFMT_NOFILE 0x0001
#define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */
#define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */
-#if FF_API_LAVF_FMT_RAWPICTURE
-#define AVFMT_RAWPICTURE 0x0020 /**< Format wants AVPicture structure for
- raw picture data. @deprecated Not used anymore */
-#endif
#define AVFMT_GLOBALHEADER 0x0040 /**< Format wants global header. */
#define AVFMT_NOTIMESTAMPS 0x0080 /**< Format does not need / have any timestamps. */
#define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */
diff --git a/libavformat/version.h b/libavformat/version.h
index 8ae091f..ac409db 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -55,9 +55,6 @@
* at once through the bump. This improves the git bisect-ability of the change.
*
*/
-#ifndef FF_API_LAVF_FMT_RAWPICTURE
-#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
#ifndef FF_API_COMPUTE_PKT_FIELDS2
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
--
1.7.10.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
