History

avcodec/mpeg12dec: don't use sizeof(AVStereo3D)

It's not part of the libavutil ABI.

James Almer committed 2 years ago

Commit 7c0ebb01 parent e6baf4f1 file · +6 −6Browse files

Unified · Split

libavcodec/mpeg12dec.c+6−6
@@ -73,7 +73,7 @@ typedef struct Mpeg1Context { · 72 unmodified lines
7373 MpegEncContext mpeg_enc_ctx;
7474 int repeat_field; /* true if we must repeat the field */
7575 AVPanScan pan_scan; /* some temporary storage for the panscan */
76− AVStereo3D stereo3d;
76+ enum AVStereo3DType stereo3d_type;
7777 int has_stereo3d;
7878 AVBufferRef *a53_buf_ref;
7979 enum Mpeg2ClosedCaptionsFormat cc_format;
@@ -1319,7 +1319,7 @@ static int mpeg_field_start(Mpeg1Context *s1, const uint8_t *buf, int buf_size) · 1239 unmodified lines
13191319 if (!stereo)
13201320 return AVERROR(ENOMEM);
13211321
1322− *stereo = s1->stereo3d;
1322+ stereo->type = s1->stereo3d_type;
13231323 s1->has_stereo3d = 0;
13241324 }
13251325
@@ -2118,16 +2118,16 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, · 792 unmodified lines
21182118
21192119 switch (S3D_video_format_type) {
21202120 case 0x03:
2121− s1->stereo3d.type = AV_STEREO3D_SIDEBYSIDE;
2121+ s1->stereo3d_type = AV_STEREO3D_SIDEBYSIDE;
21222122 break;
21232123 case 0x04:
2124− s1->stereo3d.type = AV_STEREO3D_TOPBOTTOM;
2124+ s1->stereo3d_type = AV_STEREO3D_TOPBOTTOM;
21252125 break;
21262126 case 0x08:
2127− s1->stereo3d.type = AV_STEREO3D_2D;
2127+ s1->stereo3d_type = AV_STEREO3D_2D;
21282128 break;
21292129 case 0x23:
2130− s1->stereo3d.type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX;
2130+ s1->stereo3d_type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX;
21312131 break;
21322132 }
21332133 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t