diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-08-22 22:18:08 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-08-22 22:18:08 +0000 |
| commit | d6eb3c500aeab8ae9f138f8eb70d045ac47100ee (patch) | |
| tree | 1c3e18cdbf6b7b644fd64ac29bac67cf6c25d84d /libavcodec/mpeg12.c | |
| parent | c3bf0288c9bc119e41818fc4b94290d54c4bc5cb (diff) | |
| download | ffmpeg-d6eb3c500aeab8ae9f138f8eb70d045ac47100ee.tar.gz | |
custom quant matrix encoding support
Originally committed as revision 2135 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 438e709799..41c96ec474 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -240,8 +240,9 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) vbv_buffer_size = (( 20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024; put_bits(&s->pb, 10, (vbv_buffer_size + 16383) / 16384); put_bits(&s->pb, 1, 1); /* constrained parameter flag */ - put_bits(&s->pb, 1, 0); /* no custom intra matrix */ - put_bits(&s->pb, 1, 0); /* no custom non intra matrix */ + + ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix); + ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix); put_header(s, GOP_START_CODE); put_bits(&s->pb, 1, 0); /* do drop frame */ |