diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 18:51:57 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:16:57 +0200 |
commit | eacf7d650dfe6e97d6100a232fa6a89592b625b5 (patch) | |
tree | 08ac45fefde0eab9e8084743ee5a808f39f77d69 /libavformat/flacenc.c | |
parent | beeb7551d6ab44bc6a1125e6d537508bff3694fc (diff) | |
parent | 0c1959b056f6ccaa2eee2c824352ba93c8e36d52 (diff) |
Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'
* commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52':
lavf: add AVFMT_FLAG_BITEXACT.
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/flacenc.c
libavformat/movenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flacenc.c')
-rw-r--r-- | libavformat/flacenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 0eca5aaccb..d92801807e 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -98,7 +98,7 @@ static int flac_write_header(struct AVFormatContext *s) return ret; ret = flac_write_block_comment(s->pb, &s->metadata, !padding, - codec->flags & CODEC_FLAG_BITEXACT); + s->flags & AVFMT_FLAG_BITEXACT); if (ret) return ret; |