summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-06-25 23:57:06 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-06-25 23:57:06 +0000
commitfc658cfe2b84ef98f4ff4f3349e2bed8ae28b407 (patch)
tree4e66a89b610ebea2f0408d2d626a93145ea5ff1f
parentf53dd4682c67c8328b1f2ca1e5e730fe6ecac4c2 (diff)
Support >=4096 dimensions, fixes issue499.
Originally committed as revision 13984 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpeg12enc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index fa7e098fbe..37d1d56a18 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -206,8 +206,8 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
/* mpeg1 header repeated every gop */
put_header(s, SEQ_START_CODE);
- put_bits(&s->pb, 12, s->width);
- put_bits(&s->pb, 12, s->height);
+ put_bits(&s->pb, 12, s->width & 0xFFF);
+ put_bits(&s->pb, 12, s->height & 0xFFF);
for(i=1; i<15; i++){
float error= aspect_ratio;
@@ -272,8 +272,8 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
put_bits(&s->pb, 1, s->progressive_sequence);
put_bits(&s->pb, 2, s->chroma_format);
- put_bits(&s->pb, 2, 0); //horizontal size ext
- put_bits(&s->pb, 2, 0); //vertical size ext
+ put_bits(&s->pb, 2, s->width >>12);
+ put_bits(&s->pb, 2, s->height>>12);
put_bits(&s->pb, 12, v>>18); //bitrate ext
put_bits(&s->pb, 1, 1); //marker
put_bits(&s->pb, 8, vbv_buffer_size >>10); //vbv buffer ext