Unified · Split
| @@ -594,10 +594,8 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s) · 593 unmodified lines | |||
| 594 | 594 | ||
| 595 | if (fpa_type != 0) { | 595 | if (fpa_type != 0) { |
| 596 | put_header(s, USER_START_CODE); | 596 | put_header(s, USER_START_CODE); |
| 597 | put_bits(&s->pb, 8, 'J'); // S3D_video_format_signaling_identifier | 597 | // S3D_video_format_signaling_identifier |
| 598 | put_bits(&s->pb, 8, 'P'); | 598 | put_bits32(&s->pb, MKBETAG('J','P','3','D')); |
| 599 | put_bits(&s->pb, 8, '3'); | ||
| 600 | put_bits(&s->pb, 8, 'D'); | ||
| 601 | put_bits(&s->pb, 8, 0x03); // S3D_video_format_length | 599 | put_bits(&s->pb, 8, 0x03); // S3D_video_format_length |
| 602 | 600 | ||
| 603 | put_bits(&s->pb, 1, 1); // reserved_bit | 601 | put_bits(&s->pb, 1, 1); // reserved_bit |
| @@ -612,21 +610,15 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s) · 8 unmodified lines | |||
| 612 | AV_FRAME_DATA_A53_CC); | 610 | AV_FRAME_DATA_A53_CC); |
| 613 | if (side_data) { | 611 | if (side_data) { |
| 614 | if (side_data->size <= A53_MAX_CC_COUNT * 3 && side_data->size % 3 == 0) { | 612 | if (side_data->size <= A53_MAX_CC_COUNT * 3 && side_data->size % 3 == 0) { |
| 615 | int i = 0; | ||
| 616 | |||
| 617 | put_header (s, USER_START_CODE); | 613 | put_header (s, USER_START_CODE); |
| 618 | 614 | ||
| 619 | put_bits(&s->pb, 8, 'G'); // user_identifier | 615 | put_bits32(&s->pb, MKBETAG('G','A','9','4')); // user_identifier |
| 620 | put_bits(&s->pb, 8, 'A'); | ||
| 621 | put_bits(&s->pb, 8, '9'); | ||
| 622 | put_bits(&s->pb, 8, '4'); | ||
| 623 | put_bits(&s->pb, 8, 3); // user_data_type_code | 616 | put_bits(&s->pb, 8, 3); // user_data_type_code |
| 624 | put_bits(&s->pb, 8, | 617 | put_bits(&s->pb, 8, |
| 625 | (side_data->size / 3 & A53_MAX_CC_COUNT) | 0x40); // flags, cc_count | 618 | (side_data->size / 3 & A53_MAX_CC_COUNT) | 0x40); // flags, cc_count |
| 626 | put_bits(&s->pb, 8, 0xff); // em_data | 619 | put_bits(&s->pb, 8, 0xff); // em_data |
| 627 | 620 | ||
| 628 | for (i = 0; i < side_data->size; i++) | 621 | ff_copy_bits(&s->pb, side_data->data, side_data->size); |
| 629 | put_bits(&s->pb, 8, side_data->data[i]); | ||
| 630 | 622 | ||
| 631 | put_bits(&s->pb, 8, 0xff); // marker_bits | 623 | put_bits(&s->pb, 8, 0xff); // marker_bits |
| 632 | } else { | 624 | } else { |