virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/ffmdec: Drop flags2, debug and codec->time_base setting

Browse Source 
It should still be possible to set these through recommended_encoder_configuration

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-12-03 00:52:56 +01:00
parent e706e2e775
commit 418a2b2478
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/ffmdec.c
View File

@@ -364,8 +364,8 @@ static int ffm2_read_header(AVFormatContext *s)
goto fail; goto fail;
} }
codec->flags = avio_rb32(pb); codec->flags = avio_rb32(pb);
codec->flags2 = avio_rb32(pb); avio_rb32(pb); // flags2
codec->debug = avio_rb32(pb); avio_rb32(pb); // debug
if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
int size = avio_rb32(pb); int size = avio_rb32(pb);
if (size < 0 || size >= FF_MAX_EXTRADATA_SIZE) { if (size < 0 || size >= FF_MAX_EXTRADATA_SIZE) {
@@ -385,14 +385,8 @@ static int ffm2_read_header(AVFormatContext *s)
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
codec->time_base.num = avio_rb32(pb); avio_rb32(pb); // time_base.num
codec->time_base.den = avio_rb32(pb); avio_rb32(pb); // time_base.den
if (codec->time_base.num <= 0 || codec->time_base.den <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid time base %d/%d\n",
codec->time_base.num, codec->time_base.den);
ret = AVERROR_INVALIDDATA;
goto fail;
}
codecpar->width = avio_rb16(pb); codecpar->width = avio_rb16(pb);
codecpar->height = avio_rb16(pb); codecpar->height = avio_rb16(pb);
ret = av_image_check_size(codecpar->width, codecpar->height, 0, s); ret = av_image_check_size(codecpar->width, codecpar->height, 0, s);
@@ -598,18 +592,13 @@ static int ffm_read_header(AVFormatContext *s)
goto fail; goto fail;
} }
codec->flags = avio_rb32(pb); codec->flags = avio_rb32(pb);
codec->flags2 = avio_rb32(pb); avio_rb32(pb); // flags2
codec->debug = avio_rb32(pb); avio_rb32(pb); // debug
/* specific info */ /* specific info */
switch(codecpar->codec_type) { switch(codecpar->codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
codec->time_base.num = avio_rb32(pb); avio_rb32(pb); // time_base.num
codec->time_base.den = avio_rb32(pb); avio_rb32(pb); // time_base.den
if (codec->time_base.num <= 0 || codec->time_base.den <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid time base %d/%d\n",
codec->time_base.num, codec->time_base.den);
goto fail;
}
codecpar->width = avio_rb16(pb); codecpar->width = avio_rb16(pb);
codecpar->height = avio_rb16(pb); codecpar->height = avio_rb16(pb);
if (av_image_check_size(codecpar->width, codecpar->height, 0, s) < 0) if (av_image_check_size(codecpar->width, codecpar->height, 0, s) < 0)