Revision 8a515d2d libavcodec/mjpeg.c

View differences:

libavcodec/mjpeg.c
1915 1915

  
1916 1916
    skip_bits(&hgb, 32); /* reserved zeros */
1917 1917
    
1918
    if (get_bits(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg")))
1918
    if (get_bits_long(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg")))
1919 1919
    {
1920 1920
	dprintf("not mjpeg-b (bad fourcc)\n");
1921 1921
	return 0;
1922 1922
    }
1923 1923

  
1924
    field_size = get_bits(&hgb, 32); /* field size */
1924
    field_size = get_bits_long(&hgb, 32); /* field size */
1925 1925
    dprintf("field size: 0x%x\n", field_size);
1926 1926
    skip_bits(&hgb, 32); /* padded field size */
1927
    second_field_offs = get_bits(&hgb, 32);
1927
    second_field_offs = get_bits_long(&hgb, 32);
1928 1928
    dprintf("second field offs: 0x%x\n", second_field_offs);
1929 1929
    if (second_field_offs)
1930 1930
	s->interlaced = 1;
1931 1931

  
1932
    dqt_offs = get_bits(&hgb, 32);
1932
    dqt_offs = get_bits_long(&hgb, 32);
1933 1933
    dprintf("dqt offs: 0x%x\n", dqt_offs);
1934 1934
    if (dqt_offs)
1935 1935
    {
......
1938 1938
	mjpeg_decode_dqt(s);
1939 1939
    }
1940 1940
    
1941
    dht_offs = get_bits(&hgb, 32);
1941
    dht_offs = get_bits_long(&hgb, 32);
1942 1942
    dprintf("dht offs: 0x%x\n", dht_offs);
1943 1943
    if (dht_offs)
1944 1944
    {
......
1947 1947
	mjpeg_decode_dht(s);
1948 1948
    }
1949 1949

  
1950
    sof_offs = get_bits(&hgb, 32);
1950
    sof_offs = get_bits_long(&hgb, 32);
1951 1951
    dprintf("sof offs: 0x%x\n", sof_offs);
1952 1952
    if (sof_offs)
1953 1953
    {
......
1957 1957
	    return -1;
1958 1958
    }
1959 1959

  
1960
    sos_offs = get_bits(&hgb, 32);
1960
    sos_offs = get_bits_long(&hgb, 32);
1961 1961
    dprintf("sos offs: 0x%x\n", sos_offs);
1962 1962
    if (sos_offs)
1963 1963
    {

Also available in: Unified diff