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/ffmenc: set bitexact mode for old API without accessing the encoder

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-12-01 16:58:37 +01:00
parent c06d4f2ced
commit e8215b77ff
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/ffmenc.c
View File

@@ -223,6 +223,7 @@ static int ffm_write_header(AVFormatContext *s)
/* list of streams */ /* list of streams */
for(i=0;i<s->nb_streams;i++) { for(i=0;i<s->nb_streams;i++) {
int flags = 0;
st = s->streams[i]; st = s->streams[i];
avpriv_set_pts_info(st, 64, 1, 1000000); avpriv_set_pts_info(st, 64, 1, 1000000);
if(avio_open_dyn_buf(&pb) < 0) if(avio_open_dyn_buf(&pb) < 0)
@@ -234,7 +235,16 @@ static int ffm_write_header(AVFormatContext *s)
avio_wb32(pb, codecpar->codec_id); avio_wb32(pb, codecpar->codec_id);
avio_w8(pb, codecpar->codec_type); avio_w8(pb, codecpar->codec_type);
avio_wb32(pb, codecpar->bit_rate); avio_wb32(pb, codecpar->bit_rate);
avio_wb32(pb, codecpar->extradata_size ? AV_CODEC_FLAG_GLOBAL_HEADER : 0); if (codecpar->extradata_size)
flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
// If the user is not providing us with a configuration we have to fill it in as we cannot access the encoder
if (!st->recommended_encoder_configuration) {
if (s->flags & AVFMT_FLAG_BITEXACT)
flags |= AV_CODEC_FLAG_BITEXACT;
}
avio_wb32(pb, flags);
avio_wb32(pb, 0); // flags2 avio_wb32(pb, 0); // flags2
avio_wb32(pb, 0); // debug avio_wb32(pb, 0); // debug
if (codecpar->extradata_size) { if (codecpar->extradata_size) {

2
tests/ref/lavf/ffm
View File

@@ -1,3 +1,3 @@
15a9929d1cb7129dcaffeccf3cb2fda9 *./tests/data/lavf/lavf.ffm 03f2673a39a9494157eb4be9af537f84 *./tests/data/lavf/lavf.ffm
376832 ./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm
./tests/data/lavf/lavf.ffm CRC=0x000e23ae ./tests/data/lavf/lavf.ffm CRC=0x000e23ae