highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: add deprecation guards around remaining AVFMT_RAWPICTURE usage

Browse Source
This commit is contained in:
Hendrik Leppkes 2015-10-14 14:46:40 +02:00
parent 435dfc15df
commit a34dfc93ef
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffmpeg.c
View File

@ -1099,6 +1099,7 @@ static void do_video_out(AVFormatContext *s,
#endif #endif
return; return;
#if FF_API_LAVF_FMT_RAWPICTURE
if (s->oformat->flags & AVFMT_RAWPICTURE && if (s->oformat->flags & AVFMT_RAWPICTURE &&
enc->codec->id == AV_CODEC_ID_RAWVIDEO) { enc->codec->id == AV_CODEC_ID_RAWVIDEO) {
/* raw pictures are written as AVPicture structure to /* raw pictures are written as AVPicture structure to
@ -1114,7 +1115,9 @@ static void do_video_out(AVFormatContext *s,
pkt.flags |= AV_PKT_FLAG_KEY; pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, ost); write_frame(s, &pkt, ost);
} else { } else
#endif
{
int got_packet, forced_keyframe = 0; int got_packet, forced_keyframe = 0;
double pts_time; double pts_time;
@ -1704,8 +1707,10 @@ static void flush_encoders(void)
if (enc->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <= 1) if (enc->codec_type == AVMEDIA_TYPE_AUDIO && enc->frame_size <= 1)
continue; continue;
#if FF_API_LAVF_FMT_RAWPICTURE
if (enc->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE) && enc->codec->id == AV_CODEC_ID_RAWVIDEO) if (enc->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE) && enc->codec->id == AV_CODEC_ID_RAWVIDEO)
continue; continue;
#endif
for (;;) { for (;;) {
int (*encode)(AVCodecContext*, AVPacket*, const AVFrame*, int*) = NULL; int (*encode)(AVCodecContext*, AVPacket*, const AVFrame*, int*) = NULL;
@ -1880,6 +1885,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
} }
av_copy_packet_side_data(&opkt, pkt); av_copy_packet_side_data(&opkt, pkt);
#if FF_API_LAVF_FMT_RAWPICTURE
if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
ost->st->codec->codec_id == AV_CODEC_ID_RAWVIDEO && ost->st->codec->codec_id == AV_CODEC_ID_RAWVIDEO &&
(of->ctx->oformat->flags & AVFMT_RAWPICTURE)) { (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
@ -1894,6 +1900,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
opkt.size = sizeof(AVPicture); opkt.size = sizeof(AVPicture);
opkt.flags |= AV_PKT_FLAG_KEY; opkt.flags |= AV_PKT_FLAG_KEY;
} }
#endif
write_frame(of->ctx, &opkt, ost); write_frame(of->ctx, &opkt, ost);
} }