History

h264dec: do not return a value from init_dimensions()

There are no failure cases left in this function.

Anton Khirnov committed 9 years ago

Commit e38b8b01 parent 1b179881 file · +2 −6Browse files

Unified · Split

libavcodec/h264_slice.c+2−6
@@ -864,7 +864,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) · 863 unmodified lines
864864 }
865865
866866 /* export coded and cropped frame dimensions to AVCodecContext */
867−static int init_dimensions(H264Context *h)
867+static void init_dimensions(H264Context *h)
868868 {
869869 const SPS *sps = (const SPS*)h->ps.sps;
870870 int cr = sps->crop_right;
@@ -902,8 +902,6 @@ static int init_dimensions(H264Context *h) · 31 unmodified lines
902902 h->crop_left = cl;
903903 h->crop_top = ct;
904904 h->crop_bottom = cb;
905−
906− return 0;
907905 }
908906
909907 static int h264_slice_header_init(H264Context *h)
@@ -1068,9 +1066,7 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl · 158 unmodified lines
10681066 h->width = 16 * h->mb_width;
10691067 h->height = 16 * h->mb_height;
10701068
1071− ret = init_dimensions(h);
1072− if (ret < 0)
1073− return ret;
1069+ init_dimensions(h);
10741070
10751071 if (sps->video_signal_type_present_flag) {
10761072 h->avctx->color_range = sps->full_range > 0 ? AVCOL_RANGE_JPEG

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